save Preferred, Stage, Song, and Current modifiers separately. This eliminates the fragile mods store/restore.

2006-08-05 02:38:05 +00:00
parent 5440a7b613
commit 7ac45c24e4
47 changed files with 389 additions and 363 deletions
@@ -1170,8 +1170,8 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
 			// apply #LIVES
 			if( pCourse->m_iLives != -1 )
 			{
-				GAMESTATE->m_SongOptions.m_LifeType = SongOptions::LIFE_BATTERY;
-				GAMESTATE->m_SongOptions.m_iBatteryLives = pCourse->m_iLives;
+				MODS_GROUP_ASSIGN( GAMESTATE->m_SongOptions, ModsLevel_Stage, .m_LifeType = SongOptions::LIFE_BATTERY );
+				MODS_GROUP_ASSIGN( GAMESTATE->m_SongOptions, ModsLevel_Stage, .m_iBatteryLives = pCourse->m_iLives );
 			}

 			m_bMadeChoice = true;