actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

fix reloading: simply calling LoadFromSMFile won't reset everything,

Browse Source 
leading to duplicate notes and some other stuff not always being reverted
This commit is contained in:
Glenn Maynard
2003-06-24 20:06:16 +00:00
parent 9c2c8873c5
commit 9342550563
2 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenEdit.cpp
+1 -1
View File
@@ -1110,7 +1110,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
{ {
case SM_GoToNextScreen: case SM_GoToNextScreen:
// Reload song from disk to discard changes. // Reload song from disk to discard changes.
GAMESTATE->m_pCurSong->LoadFromSongDir( GAMESTATE->m_pCurSong->GetSongDir() ); GAMESTATE->m_pCurSong->RevertFromDisk();
SCREENMAN->SetNewScreen( "ScreenEditMenu" ); SCREENMAN->SetNewScreen( "ScreenEditMenu" );
break; break;
case SM_BackFromMainMenu: case SM_BackFromMainMenu:
stepmania/src/ScreenGameplay.cpp
+1 -3
View File
@@ -1306,14 +1306,12 @@ void SaveChanges()
void DontSaveChanges() void DontSaveChanges()
{ {
SMLoader ld;
switch( GAMESTATE->m_PlayMode ) switch( GAMESTATE->m_PlayMode )
{ {
case PLAY_MODE_ARCADE: case PLAY_MODE_ARCADE:
case PLAY_MODE_BATTLE: case PLAY_MODE_BATTLE:
case PLAY_MODE_RAVE: case PLAY_MODE_RAVE:
ld.LoadFromSMFile(GAMESTATE->m_pCurSong->GetCacheFilePath(), GAMESTATE->m_pCurSong->RevertFromDisk();
*GAMESTATE->m_pCurSong);
break; break;
case PLAY_MODE_NONSTOP: case PLAY_MODE_NONSTOP:
case PLAY_MODE_ONI: case PLAY_MODE_ONI: