some bugfixes to option screens:

1) fixed normal/difficult course difficulty if single player (kept defaulting to second player's option which didn't exist)
2) battery # of lives now defaults to 4 on an invalid value
This commit is contained in:
Andrew Wong
2003-08-10 00:39:28 +00:00
parent d3dadcc2e2
commit b5d0545f42
2 changed files with 15 additions and 0 deletions
+11
View File
@@ -271,6 +271,11 @@ void ScreenPlayerOptions::ExportOptions()
* erase everything. */
// po.Init();
// if player isn't enabled, don't bother parsing options
// **very important for nonstop difficulties**
if (!GAMESTATE->IsPlayerEnabled(p))
continue;
switch( m_iSelectedOption[p][PO_SPEED] )
{
case 0: po.m_bTimeSpacing = false; po.m_fScrollSpeed = 0.25f; break;
@@ -335,9 +340,15 @@ void ScreenPlayerOptions::ExportOptions()
if( GAMESTATE->m_pCurCourse ) // playing a course
{
if( m_iSelectedOption[p][PO_STEP] == 1 )
{
GAMESTATE->m_bDifficultCourses = true;
LOG->Trace("ScreenPlayerOptions: Using difficult course");
}
else
{
GAMESTATE->m_bDifficultCourses = false;
LOG->Trace("ScreenPlayerOptions: Using normal course");
}
}
else
{
+4
View File
@@ -75,6 +75,10 @@ void ScreenSongOptions::ImportOptions()
m_iSelectedOption[0][SO_LIFE] = so.m_LifeType;
m_iSelectedOption[0][SO_BAT_LIVES] = so.m_iBatteryLives-1;
if ( m_iSelectedOption[0][SO_BAT_LIVES] < 0 )
m_iSelectedOption[0][SO_BAT_LIVES] = 3; // default in case value is invalid
m_iSelectedOption[0][SO_FAIL] = so.m_FailType;
m_iSelectedOption[0][SO_ASSIST] = so.m_bAssistTick;
m_iSelectedOption[0][SO_AUTOSYNC] = so.m_bAutoSync;