[default -> timing] Bring up to date for test.
This commit is contained in:
+8
-8
@@ -2965,12 +2965,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
|
||||
if( iCheckpointFrequencyRows > 0 )
|
||||
{
|
||||
// "the first row after the start of the range that lands on a beat"
|
||||
int iFirstCheckpointInRange = QuantizeUp(m_iFirstUncrossedRow,
|
||||
iCheckpointFrequencyRows);
|
||||
int iFirstCheckpointInRange = ((m_iFirstUncrossedRow+iCheckpointFrequencyRows-1)
|
||||
/iCheckpointFrequencyRows) * iCheckpointFrequencyRows;
|
||||
|
||||
// "the last row or first row earlier that lands on a beat"
|
||||
int iLastCheckpointInRange = QuantizeDown(iLastRowCrossed,
|
||||
iCheckpointFrequencyRows);
|
||||
int iLastCheckpointInRange = ((iLastRowCrossed)/iCheckpointFrequencyRows)
|
||||
* iCheckpointFrequencyRows;
|
||||
|
||||
for( int r = iFirstCheckpointInRange; r <= iLastCheckpointInRange; r += iCheckpointFrequencyRows )
|
||||
{
|
||||
@@ -2992,12 +2992,12 @@ void Player::CrossedRows( int iLastRowCrossed, const RageTimer &now )
|
||||
int iTrack = nIter.Track();
|
||||
|
||||
// "the first row after the hold head that lands on a beat"
|
||||
int iFirstCheckpointOfHold = QuantizeUp(iStartRow,
|
||||
iCheckpointFrequencyRows);
|
||||
int iFirstCheckpointOfHold = ((iStartRow+iCheckpointFrequencyRows)/iCheckpointFrequencyRows)
|
||||
* iCheckpointFrequencyRows;
|
||||
|
||||
// "the end row or the first earlier row that lands on a beat"
|
||||
int iLastCheckpointOfHold = QuantizeDown(iEndRow,
|
||||
iCheckpointFrequencyRows);
|
||||
int iLastCheckpointOfHold = ((iEndRow)/iCheckpointFrequencyRows)
|
||||
* iCheckpointFrequencyRows;
|
||||
|
||||
// count the end of the hold as a checkpoint
|
||||
bool bHoldOverlapsRow = iFirstCheckpointOfHold <= r && r <= iLastCheckpointOfHold;
|
||||
|
||||
@@ -11,7 +11,6 @@
|
||||
|
||||
// main page (group list)
|
||||
REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongs );
|
||||
REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongsSubPage );
|
||||
|
||||
void ScreenOptionsToggleSongs::BeginScreen()
|
||||
{
|
||||
@@ -49,8 +48,7 @@ void ScreenOptionsToggleSongs::ProcessMenuStart( const InputEventPlus &input )
|
||||
|
||||
// switch to the subpage with the specified group
|
||||
int iRow = GetCurrentRow();
|
||||
OptionRow &row = *m_pRows[iRow];
|
||||
if( row.GetRowType() == OptionRow::RowType_Exit )
|
||||
if( m_pRows[iRow]->GetRowType() == OptionRow::RowType_Exit )
|
||||
{
|
||||
ScreenOptions::ProcessMenuStart( input );
|
||||
return;
|
||||
@@ -70,6 +68,7 @@ void ScreenOptionsToggleSongs::ExportOptions( int row, const vector<PlayerNumber
|
||||
}
|
||||
|
||||
// subpage (has the songs in a specific group)
|
||||
REGISTER_SCREEN_CLASS( ScreenOptionsToggleSongsSubPage );
|
||||
void ScreenOptionsToggleSongsSubPage::BeginScreen()
|
||||
{
|
||||
m_apSongs.clear();
|
||||
|
||||
@@ -242,10 +242,14 @@ void StatsManager::CommitStatsToProfiles( const StageStats *pSS )
|
||||
pPlayerProfile->m_iNumTotalSongsPlayed += pSS->m_vpPlayedSongs.size();
|
||||
}
|
||||
|
||||
LOG->Trace("Adding stats to machine profile...");
|
||||
AddPlayerStatsToProfile( pMachineProfile, *pSS, pn );
|
||||
|
||||
if( pPlayerProfile )
|
||||
{
|
||||
LOG->Trace("Adding stats to player profile...");
|
||||
AddPlayerStatsToProfile( pPlayerProfile, *pSS, pn );
|
||||
}
|
||||
|
||||
CHECKPOINT;
|
||||
}
|
||||
|
||||
@@ -2,7 +2,7 @@
|
||||
<VisualStudioProject
|
||||
ProjectType="Visual C++"
|
||||
Version="9.00"
|
||||
Name="sm-ssc"
|
||||
Name="StepMania"
|
||||
ProjectGUID="{AF209DBD-24BD-4356-8DFE-41751B221195}"
|
||||
RootNamespace="StepMania"
|
||||
Keyword="MFCProj"
|
||||
|
||||
@@ -19,7 +19,7 @@
|
||||
</ProjectConfiguration>
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<ProjectName>sm-ssc</ProjectName>
|
||||
<ProjectName>StepMania</ProjectName>
|
||||
<ProjectGuid>{AF209DBD-24BD-4356-8DFE-41751B221195}</ProjectGuid>
|
||||
<RootNamespace>StepMania</RootNamespace>
|
||||
<Keyword>MFCProj</Keyword>
|
||||
|
||||
+1
-1
@@ -1106,7 +1106,7 @@ int main(int argc, char* argv[])
|
||||
STATSMAN = new StatsManager;
|
||||
|
||||
// Initialize which courses are ranking courses here.
|
||||
pLoadingWindow->SetText("Updating cource rankings...");
|
||||
pLoadingWindow->SetText("Updating course rankings...");
|
||||
SONGMAN->UpdateRankingCourses();
|
||||
|
||||
SAFE_DELETE( pLoadingWindow ); // destroy this before init'ing Display
|
||||
|
||||
@@ -356,7 +356,7 @@ struct ComboSegment : public TimingSegment
|
||||
* It is best to override the values as soon as possible.
|
||||
*/
|
||||
ComboSegment() :
|
||||
TimingSegment(-1), combo(1) { }
|
||||
TimingSegment(-1), combo(1), missCombo(1) { }
|
||||
|
||||
ComboSegment(const ComboSegment &other) :
|
||||
TimingSegment(other.GetRow()),
|
||||
|
||||
Reference in New Issue
Block a user