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

remove unused workout options

Browse Source
This commit is contained in:
Chris Danford
2005-02-13 18:18:55 +00:00
parent dae8bf0332
commit 0da2e0fa6e
4 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameCommand.cpp
+1 -23
View File
@@ -50,9 +50,7 @@ void GameCommand::Init()
m_vsScreensToPrepare.clear(); m_vsScreensToPrepare.clear();
m_bDeletePreparedScreens = false; m_bDeletePreparedScreens = false;
m_iWeightPounds = -1; m_iWeightPounds = -1;
m_iAddToAllCourseEntryMeters = -100;
m_iStopCourseAtSeconds = -1; m_iStopCourseAtSeconds = -1;
m_bAutoAdjustMeterDuringCorse = false;
m_bClearBookkeepingData = false; m_bClearBookkeepingData = false;
m_bClearMachineStats = false; m_bClearMachineStats = false;
@@ -125,12 +123,8 @@ bool GameCommand::DescribesCurrentMode( PlayerNumber pn ) const
return false; return false;
if( m_iWeightPounds != -1 && GAMESTATE->m_pPlayerState[pn]->m_iWeightPounds != m_iWeightPounds ) if( m_iWeightPounds != -1 && GAMESTATE->m_pPlayerState[pn]->m_iWeightPounds != m_iWeightPounds )
return false; return false;
if( m_iAddToAllCourseEntryMeters != -100 && GAMESTATE->m_iAddToAllCourseEntryMeters != m_iAddToAllCourseEntryMeters )
return false;
if( m_iStopCourseAtSeconds != -1 && GAMESTATE->m_iStopCourseAtSeconds != m_iStopCourseAtSeconds ) if( m_iStopCourseAtSeconds != -1 && GAMESTATE->m_iStopCourseAtSeconds != m_iStopCourseAtSeconds )
return false; return false;
if( m_bAutoAdjustMeterDuringCorse && !GAMESTATE->m_bAutoAdjustMeterDuringCorse )
return false;
return true; return true;
} }
@@ -308,21 +302,11 @@ void GameCommand::Load( int iIndex, const Commands& cmds )
m_iWeightPounds = atoi( sValue ); m_iWeightPounds = atoi( sValue );
} }
else if( sName == "addtoallcourseentrymeters" )
{
m_iAddToAllCourseEntryMeters = atoi( sValue );
}
else if( sName == "stopcourseatseconds" ) else if( sName == "stopcourseatseconds" )
{ {
m_iStopCourseAtSeconds = atoi( sValue ); m_iStopCourseAtSeconds = atoi( sValue );
} }
else if( sName == "autoadjustmeterduringcorse" )
{
m_bAutoAdjustMeterDuringCorse = !!atoi( sValue );
}
else if( sName == "unlock" ) else if( sName == "unlock" )
{ {
m_iUnlockIndex = atoi( sValue ); m_iUnlockIndex = atoi( sValue );
@@ -657,12 +641,8 @@ void GameCommand::Apply( const vector<PlayerNumber> &vpns ) const
if( m_iWeightPounds != -1 ) if( m_iWeightPounds != -1 )
FOREACH_CONST( PlayerNumber, vpns, pn ) FOREACH_CONST( PlayerNumber, vpns, pn )
GAMESTATE->m_pPlayerState[*pn]->m_iWeightPounds = m_iWeightPounds; GAMESTATE->m_pPlayerState[*pn]->m_iWeightPounds = m_iWeightPounds;
if( m_iAddToAllCourseEntryMeters != -100 )
GAMESTATE->m_iAddToAllCourseEntryMeters = m_iAddToAllCourseEntryMeters;
if( m_iStopCourseAtSeconds != -1 ) if( m_iStopCourseAtSeconds != -1 )
GAMESTATE->m_iStopCourseAtSeconds = m_iStopCourseAtSeconds; 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 /* 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. */ * stop music between preparing screens and loading screens. */
@@ -804,9 +784,7 @@ bool GameCommand::IsZero() const
!m_sSongGroup.empty() || !m_sSongGroup.empty() ||
m_SortOrder != SORT_INVALID || m_SortOrder != SORT_INVALID ||
m_iWeightPounds != -1 || m_iWeightPounds != -1 ||
m_iAddToAllCourseEntryMeters != -1 || m_iStopCourseAtSeconds != -1
m_iStopCourseAtSeconds != -1 ||
m_bAutoAdjustMeterDuringCorse
) )
return false; return false;
stepmania/src/GameCommand.h
-2
View File
@@ -60,9 +60,7 @@ public:
vector<CString> m_vsScreensToPrepare; vector<CString> m_vsScreensToPrepare;
bool m_bDeletePreparedScreens; bool m_bDeletePreparedScreens;
int m_iWeightPounds; // -1 == none specified int m_iWeightPounds; // -1 == none specified
int m_iAddToAllCourseEntryMeters; // -100 == not specified
int m_iStopCourseAtSeconds; // -1 == none specified int m_iStopCourseAtSeconds; // -1 == none specified
bool m_bAutoAdjustMeterDuringCorse;
bool m_bClearBookkeepingData; bool m_bClearBookkeepingData;
bool m_bClearMachineStats; bool m_bClearMachineStats;
stepmania/src/GameState.cpp
-2
View File
@@ -193,9 +193,7 @@ void GameState::Reset()
ASSERT( m_pCurCharacters[p] ); ASSERT( m_pCurCharacters[p] );
} }
m_iAddToAllCourseEntryMeters = 0;
m_iStopCourseAtSeconds = -1; m_iStopCourseAtSeconds = -1;
m_bAutoAdjustMeterDuringCorse = false;
LIGHTSMAN->SetLightsMode( LIGHTSMODE_ATTRACT ); LIGHTSMAN->SetLightsMode( LIGHTSMODE_ATTRACT );
stepmania/src/GameState.h
-2
View File
@@ -269,9 +269,7 @@ public:
// //
// Workout stuff // Workout stuff
// //
int m_iAddToAllCourseEntryMeters; // 0 == no change
int m_iStopCourseAtSeconds; // -1 == don't stop early int m_iStopCourseAtSeconds; // -1 == don't stop early
bool m_bAutoAdjustMeterDuringCorse;
// Lua // Lua
void PushSelf( lua_State *L ); void PushSelf( lua_State *L );