From 781017c4c069de07de98cd54bcfe282e3ce1916e Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 8 Sep 2005 01:06:01 +0000 Subject: [PATCH] ChooseRandomMofifiers -> ChooseRandomModifiers --- stepmania/src/GameCommand.cpp | 2 +- stepmania/src/PlayerOptions.cpp | 4 ++-- stepmania/src/PlayerOptions.h | 2 +- stepmania/src/ScreenEnding.cpp | 4 ++-- stepmania/src/ScreenEvaluation.cpp | 2 +- stepmania/src/ScreenEvaluationMultiplayer.cpp | 2 +- stepmania/src/ScreenJukebox.cpp | 2 +- 7 files changed, 9 insertions(+), 9 deletions(-) diff --git a/stepmania/src/GameCommand.cpp b/stepmania/src/GameCommand.cpp index 0010ac9aa1..71fb349f77 100644 --- a/stepmania/src/GameCommand.cpp +++ b/stepmania/src/GameCommand.cpp @@ -618,7 +618,7 @@ static HighScore MakeRandomHighScore( float fPercentDP ) hs.SetPercentDP( fPercentDP ); hs.SetSurviveSeconds( randomf(30.0f, 100.0f) ); PlayerOptions po; - po.ChooseRandomMofifiers(); + po.ChooseRandomModifiers(); hs.SetModifiers( po.GetString() ); hs.SetDateTime( DateTime::GetNowDateTime() ); hs.SetPlayerGuid( Profile::MakeGuid() ); diff --git a/stepmania/src/PlayerOptions.cpp b/stepmania/src/PlayerOptions.cpp index 9b62e0cd67..b941e62ef3 100644 --- a/stepmania/src/PlayerOptions.cpp +++ b/stepmania/src/PlayerOptions.cpp @@ -335,7 +335,7 @@ void PlayerOptions::FromString( CString sOptions, bool bWarnOnInvalid ) else if( sBit == "addscore" ) m_ScoreDisplay = SCORING_ADD; else if( sBit == "subtractscore" ) m_ScoreDisplay = SCORING_SUBTRACT; else if( sBit == "averagescore" ) m_ScoreDisplay = SCORING_AVERAGE; - else if( sBit == "random" ) ChooseRandomMofifiers(); + else if( sBit == "random" ) ChooseRandomModifiers(); else { if( bWarnOnInvalid ) @@ -430,7 +430,7 @@ void PlayerOptions::NextPerspective() } } -void PlayerOptions::ChooseRandomMofifiers() +void PlayerOptions::ChooseRandomModifiers() { if( RandomFloat(0,1)>0.8f ) m_fScrollSpeed = 1.5f; diff --git a/stepmania/src/PlayerOptions.h b/stepmania/src/PlayerOptions.h index e1602ed6b3..457688e727 100644 --- a/stepmania/src/PlayerOptions.h +++ b/stepmania/src/PlayerOptions.h @@ -21,7 +21,7 @@ struct PlayerOptions void GetMods( vector &AddTo ) const; void GetThemedMods( vector &AddTo ) const; void FromString( CString sOptions, bool bWarnOnInvalid = false ); - void ChooseRandomMofifiers(); + void ChooseRandomModifiers(); bool ContainsTransformOrTurn() const; bool operator==( const PlayerOptions &other ) const; diff --git a/stepmania/src/ScreenEnding.cpp b/stepmania/src/ScreenEnding.cpp index efff24176c..578c19b797 100644 --- a/stepmania/src/ScreenEnding.cpp +++ b/stepmania/src/ScreenEnding.cpp @@ -148,8 +148,8 @@ ScreenEnding::ScreenEnding( CString sClassName ) : ScreenAttract( sClassName, fa GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.m_fScrollSpeed = 2; GAMESTATE->m_pPlayerState[PLAYER_2]->m_PlayerOptions.m_fScrollSpeed = 2; GAMESTATE->m_iCurrentStageIndex = 0; - GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.ChooseRandomMofifiers(); - GAMESTATE->m_pPlayerState[PLAYER_2]->m_PlayerOptions.ChooseRandomMofifiers(); + GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.ChooseRandomModifiers(); + GAMESTATE->m_pPlayerState[PLAYER_2]->m_PlayerOptions.ChooseRandomModifiers(); for( float f = 0; f < 100.0f; f += 1.0f ) { diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 9d2d03f03b..977dce143f 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -120,7 +120,7 @@ ScreenEvaluation::ScreenEvaluation( CString sClassName ) : ScreenWithMenuElement STATSMAN->m_CurStageStats.m_player[p].vpPlayedSteps.push_back( GAMESTATE->m_pCurSteps[PLAYER_1] ); STATSMAN->m_CurStageStats.m_player[p].vpPossibleSteps.push_back( GAMESTATE->m_pCurSteps[PLAYER_1] ); GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.m_fScrollSpeed = 2; - GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.ChooseRandomMofifiers(); + GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.ChooseRandomModifiers(); } for( float f = 0; f < 100.0f; f += 1.0f ) diff --git a/stepmania/src/ScreenEvaluationMultiplayer.cpp b/stepmania/src/ScreenEvaluationMultiplayer.cpp index d9d0b0d233..e5453f8799 100644 --- a/stepmania/src/ScreenEvaluationMultiplayer.cpp +++ b/stepmania/src/ScreenEvaluationMultiplayer.cpp @@ -121,7 +121,7 @@ ScreenEvaluationMultiplayer::ScreenEvaluationMultiplayer( CString sClassName ) : STATSMAN->m_CurStageStats.m_player[PLAYER_1].vpPlayedSteps.push_back( GAMESTATE->m_pCurSteps[PLAYER_1] ); STATSMAN->m_CurStageStats.m_player[PLAYER_1].vpPossibleSteps.push_back( GAMESTATE->m_pCurSteps[PLAYER_1] ); GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.m_fScrollSpeed = 2; - GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.ChooseRandomMofifiers(); + GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.ChooseRandomModifiers(); FOREACH_MultiPlayer( p ) { diff --git a/stepmania/src/ScreenJukebox.cpp b/stepmania/src/ScreenJukebox.cpp index 8182a8f4cd..de758208f0 100644 --- a/stepmania/src/ScreenJukebox.cpp +++ b/stepmania/src/ScreenJukebox.cpp @@ -215,7 +215,7 @@ void ScreenJukebox::Init() { GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.Init(); GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.FromString( PREFSMAN->m_sDefaultModifiers ); - GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.ChooseRandomMofifiers(); + GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.ChooseRandomModifiers(); } }