fix stale Steps* in Trail being used after reverting songs from disk

This commit is contained in:
Chris Danford
2004-06-06 22:03:21 +00:00
parent f2a30de96d
commit bc030297c9
3 changed files with 23 additions and 17 deletions
-2
View File
@@ -288,7 +288,6 @@ int Profile::GetPossibleCourseDancePointsForStepsType( StepsType st ) const
int iTotal = 0; int iTotal = 0;
// add course high scores // add course high scores
{
vector<Course*> vCourses; vector<Course*> vCourses;
SONGMAN->GetAllCourses( vCourses, false ); SONGMAN->GetAllCourses( vCourses, false );
for( unsigned i=0; i<vCourses.size(); i++ ) for( unsigned i=0; i<vCourses.size(); i++ )
@@ -309,7 +308,6 @@ int Profile::GetPossibleCourseDancePointsForStepsType( StepsType st ) const
iTotal += ScoreKeeperMAX2::GetPossibleDancePoints( fRadars ); iTotal += ScoreKeeperMAX2::GetPossibleDancePoints( fRadars );
} }
} }
}
return iTotal; return iTotal;
} }
+7
View File
@@ -1804,6 +1804,13 @@ void RevertChanges( void* papSongsQueue )
vector<Song*>& apSongsQueue = *(vector<Song*>*)papSongsQueue; vector<Song*>& apSongsQueue = *(vector<Song*>*)papSongsQueue;
for( unsigned i=0; i<apSongsQueue.size(); i++ ) for( unsigned i=0; i<apSongsQueue.size(); i++ )
apSongsQueue[i]->RevertFromDisk(); apSongsQueue[i]->RevertFromDisk();
// We need to regen any Courses that have any of the songs we just reloaded.
// Regen all Courses for now.
vector<Course*> vpAllCourses;
SONGMAN->GetAllCourses( vpAllCourses, true );
FOREACH( Course*, vpAllCourses, pCourse )
(*pCourse)->RegenTrails();
} }
void ScreenGameplay::ShowSavePrompt( ScreenMessage SM_SendWhenDone ) void ScreenGameplay::ShowSavePrompt( ScreenMessage SM_SendWhenDone )
+2 -1
View File
@@ -14,7 +14,8 @@ class Steps;
struct StageStats struct StageStats
{ {
StageStats(); StageStats() { Init(); }
void Init();
void AddStats( const StageStats& other ); // accumulate void AddStats( const StageStats& other ); // accumulate
Grade GetGrade( PlayerNumber pn ) const; Grade GetGrade( PlayerNumber pn ) const;
bool OnePassed() const; bool OnePassed() const;