diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp index 487b762bf0..6b2c5af2ae 100644 --- a/stepmania/src/GameCommand.cpp +++ b/stepmania/src/GameCommand.cpp @@ -50,9 +50,7 @@ void GameCommand::Init() m_vsScreensToPrepare.clear(); m_bDeletePreparedScreens = false; m_iWeightPounds = -1; - m_iAddToAllCourseEntryMeters = -100; m_iStopCourseAtSeconds = -1; - m_bAutoAdjustMeterDuringCorse = false; m_bClearBookkeepingData = false; m_bClearMachineStats = false; @@ -125,12 +123,8 @@ bool GameCommand::DescribesCurrentMode( PlayerNumber pn ) const return false; if( m_iWeightPounds != -1 && GAMESTATE->m_pPlayerState[pn]->m_iWeightPounds != m_iWeightPounds ) return false; - if( m_iAddToAllCourseEntryMeters != -100 && GAMESTATE->m_iAddToAllCourseEntryMeters != m_iAddToAllCourseEntryMeters ) - return false; if( m_iStopCourseAtSeconds != -1 && GAMESTATE->m_iStopCourseAtSeconds != m_iStopCourseAtSeconds ) return false; - if( m_bAutoAdjustMeterDuringCorse && !GAMESTATE->m_bAutoAdjustMeterDuringCorse ) - return false; return true; } @@ -308,21 +302,11 @@ void GameCommand::Load( int iIndex, const Commands& cmds ) m_iWeightPounds = atoi( sValue ); } - else if( sName == "addtoallcourseentrymeters" ) - { - m_iAddToAllCourseEntryMeters = atoi( sValue ); - } - else if( sName == "stopcourseatseconds" ) { m_iStopCourseAtSeconds = atoi( sValue ); } - else if( sName == "autoadjustmeterduringcorse" ) - { - m_bAutoAdjustMeterDuringCorse = !!atoi( sValue ); - } - else if( sName == "unlock" ) { m_iUnlockIndex = atoi( sValue ); @@ -657,12 +641,8 @@ void GameCommand::Apply( const vector &vpns ) const if( m_iWeightPounds != -1 ) FOREACH_CONST( PlayerNumber, vpns, pn ) GAMESTATE->m_pPlayerState[*pn]->m_iWeightPounds = m_iWeightPounds; - if( m_iAddToAllCourseEntryMeters != -100 ) - GAMESTATE->m_iAddToAllCourseEntryMeters = m_iAddToAllCourseEntryMeters; if( m_iStopCourseAtSeconds != -1 ) GAMESTATE->m_iStopCourseAtSeconds = m_iStopCourseAtSeconds; - if( m_bAutoAdjustMeterDuringCorse ) - GAMESTATE->m_bAutoAdjustMeterDuringCorse = m_bAutoAdjustMeterDuringCorse; /* If we're going to stop music, do so before preparing new screens, so we don't * stop music between preparing screens and loading screens. */ @@ -804,9 +784,7 @@ bool GameCommand::IsZero() const !m_sSongGroup.empty() || m_SortOrder != SORT_INVALID || m_iWeightPounds != -1 || - m_iAddToAllCourseEntryMeters != -1 || - m_iStopCourseAtSeconds != -1 || - m_bAutoAdjustMeterDuringCorse + m_iStopCourseAtSeconds != -1 ) return false; diff --git a/stepmania/src/GameCommand.h b/stepmania/src/GameCommand.h index 8440a56498..75d406b19b 100644 --- a/stepmania/src/GameCommand.h +++ b/stepmania/src/GameCommand.h @@ -60,9 +60,7 @@ public: vector m_vsScreensToPrepare; bool m_bDeletePreparedScreens; int m_iWeightPounds; // -1 == none specified - int m_iAddToAllCourseEntryMeters; // -100 == not specified int m_iStopCourseAtSeconds; // -1 == none specified - bool m_bAutoAdjustMeterDuringCorse; bool m_bClearBookkeepingData; bool m_bClearMachineStats; diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index a809812199..a6b0f41b64 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -193,9 +193,7 @@ void GameState::Reset() ASSERT( m_pCurCharacters[p] ); } - m_iAddToAllCourseEntryMeters = 0; m_iStopCourseAtSeconds = -1; - m_bAutoAdjustMeterDuringCorse = false; LIGHTSMAN->SetLightsMode( LIGHTSMODE_ATTRACT ); diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h index 321fb90c64..c23e165c35 100644 --- a/stepmania/src/GameState.h +++ b/stepmania/src/GameState.h @@ -269,9 +269,7 @@ public: // // Workout stuff // - int m_iAddToAllCourseEntryMeters; // 0 == no change int m_iStopCourseAtSeconds; // -1 == don't stop early - bool m_bAutoAdjustMeterDuringCorse; // Lua void PushSelf( lua_State *L );