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

ChooseRandomMofifiers -> ChooseRandomModifiers

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-08 01:06:01 +00:00
parent fa1966f972
commit 781017c4c0
7 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameCommand.cpp
+1 -1
View File
@@ -618,7 +618,7 @@ static HighScore MakeRandomHighScore( float fPercentDP )
hs.SetPercentDP( fPercentDP ); hs.SetPercentDP( fPercentDP );
hs.SetSurviveSeconds( randomf(30.0f, 100.0f) ); hs.SetSurviveSeconds( randomf(30.0f, 100.0f) );
PlayerOptions po; PlayerOptions po;
po.ChooseRandomMofifiers(); po.ChooseRandomModifiers();
hs.SetModifiers( po.GetString() ); hs.SetModifiers( po.GetString() );
hs.SetDateTime( DateTime::GetNowDateTime() ); hs.SetDateTime( DateTime::GetNowDateTime() );
hs.SetPlayerGuid( Profile::MakeGuid() ); hs.SetPlayerGuid( Profile::MakeGuid() );
stepmania/src/PlayerOptions.cpp
+2 -2
View File
@@ -335,7 +335,7 @@ void PlayerOptions::FromString( CString sOptions, bool bWarnOnInvalid )
else if( sBit == "addscore" ) m_ScoreDisplay = SCORING_ADD; else if( sBit == "addscore" ) m_ScoreDisplay = SCORING_ADD;
else if( sBit == "subtractscore" ) m_ScoreDisplay = SCORING_SUBTRACT; else if( sBit == "subtractscore" ) m_ScoreDisplay = SCORING_SUBTRACT;
else if( sBit == "averagescore" ) m_ScoreDisplay = SCORING_AVERAGE; else if( sBit == "averagescore" ) m_ScoreDisplay = SCORING_AVERAGE;
else if( sBit == "random" ) ChooseRandomMofifiers(); else if( sBit == "random" ) ChooseRandomModifiers();
else else
{ {
if( bWarnOnInvalid ) if( bWarnOnInvalid )
@@ -430,7 +430,7 @@ void PlayerOptions::NextPerspective()
} }
} }
void PlayerOptions::ChooseRandomMofifiers() void PlayerOptions::ChooseRandomModifiers()
{ {
if( RandomFloat(0,1)>0.8f ) if( RandomFloat(0,1)>0.8f )
m_fScrollSpeed = 1.5f; m_fScrollSpeed = 1.5f;
stepmania/src/PlayerOptions.h
+1 -1
View File
@@ -21,7 +21,7 @@ struct PlayerOptions
void GetMods( vector<CString> &AddTo ) const; void GetMods( vector<CString> &AddTo ) const;
void GetThemedMods( vector<CString> &AddTo ) const; void GetThemedMods( vector<CString> &AddTo ) const;
void FromString( CString sOptions, bool bWarnOnInvalid = false ); void FromString( CString sOptions, bool bWarnOnInvalid = false );
void ChooseRandomMofifiers(); void ChooseRandomModifiers();
bool ContainsTransformOrTurn() const; bool ContainsTransformOrTurn() const;
bool operator==( const PlayerOptions &other ) const; bool operator==( const PlayerOptions &other ) const;
stepmania/src/ScreenEnding.cpp
+2 -2
View File
@@ -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_1]->m_PlayerOptions.m_fScrollSpeed = 2;
GAMESTATE->m_pPlayerState[PLAYER_2]->m_PlayerOptions.m_fScrollSpeed = 2; GAMESTATE->m_pPlayerState[PLAYER_2]->m_PlayerOptions.m_fScrollSpeed = 2;
GAMESTATE->m_iCurrentStageIndex = 0; GAMESTATE->m_iCurrentStageIndex = 0;
GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.ChooseRandomMofifiers(); GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.ChooseRandomModifiers();
GAMESTATE->m_pPlayerState[PLAYER_2]->m_PlayerOptions.ChooseRandomMofifiers(); GAMESTATE->m_pPlayerState[PLAYER_2]->m_PlayerOptions.ChooseRandomModifiers();
for( float f = 0; f < 100.0f; f += 1.0f ) for( float f = 0; f < 100.0f; f += 1.0f )
{ {
stepmania/src/ScreenEvaluation.cpp
+1 -1
View File
@@ -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].vpPlayedSteps.push_back( GAMESTATE->m_pCurSteps[PLAYER_1] );
STATSMAN->m_CurStageStats.m_player[p].vpPossibleSteps.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.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 ) for( float f = 0; f < 100.0f; f += 1.0f )
stepmania/src/ScreenEvaluationMultiplayer.cpp
+1 -1
View File
@@ -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].vpPlayedSteps.push_back( GAMESTATE->m_pCurSteps[PLAYER_1] );
STATSMAN->m_CurStageStats.m_player[PLAYER_1].vpPossibleSteps.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.m_fScrollSpeed = 2;
GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.ChooseRandomMofifiers(); GAMESTATE->m_pPlayerState[PLAYER_1]->m_PlayerOptions.ChooseRandomModifiers();
FOREACH_MultiPlayer( p ) FOREACH_MultiPlayer( p )
{ {
stepmania/src/ScreenJukebox.cpp
+1 -1
View File
@@ -215,7 +215,7 @@ void ScreenJukebox::Init()
{ {
GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.Init(); GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.Init();
GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.FromString( PREFSMAN->m_sDefaultModifiers ); GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.FromString( PREFSMAN->m_sDefaultModifiers );
GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.ChooseRandomMofifiers(); GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.ChooseRandomModifiers();
} }
} }