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

simplify - less state is better

Browse Source
This commit is contained in:
Glenn Maynard
2005-09-03 04:10:52 +00:00
parent 5eb0e9a128
commit 12426c547c
3 changed files with 12 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
+12 -6
View File
@@ -196,7 +196,6 @@ void GameState::Reset()
m_bDemonstrationOrJukebox = false;
m_bJukeboxUsesModifiers = false;
m_iCurrentStageIndex = 0;
m_bAllow2ndExtraStage = true;
m_BeatToNoteSkinRev = 0;
m_iNumStagesOfThisSong = 0;
@@ -921,6 +920,18 @@ bool GameState::HasEarnedExtraStage() const
if( m_bBackedOutOfFinalStage )
return false;
/* If PickExtraStage, allow EX2 if the chosen song was correct. */
if( PREFSMAN->m_bPickExtraStage && this->IsExtraStage() )
{
Song* pSong;
Steps* pSteps;
SONGMAN->GetExtraStageInfo( false, GAMESTATE->GetCurrentStyle(), pSong, pSteps, NULL, NULL );
ASSERT(pSong);
const StageStats &stats = STATSMAN->m_CurStageStats;
return stats.vpPlayedSongs.size() && stats.vpPlayedSongs.back() == pSong;
}
if( (this->IsFinalStage() || this->IsExtraStage()) )
{
FOREACH_EnabledPlayer( pn )
@@ -929,11 +940,6 @@ bool GameState::HasEarnedExtraStage() const
this->m_pCurSteps[pn]->GetDifficulty() != DIFFICULTY_CHALLENGE )
continue; /* not hard enough! */
/* If "choose EX" is enabled, then we should only grant EX2 if the chosen
* stage was the EX we would have chosen (m_bAllow2ndExtraStage is true). */
if( PREFSMAN->m_bPickExtraStage && this->IsExtraStage() && !this->m_bAllow2ndExtraStage )
continue;
if( STATSMAN->m_CurStageStats.m_player[pn].GetGrade() <= Grade_Tier03 )
return true;
}
stepmania/src/GameState.h
-1
View File
@@ -230,7 +230,6 @@ public:
bool HasEarnedExtraStage() const;
bool m_bAllow2ndExtraStage; //only used when "Allow Selection of Extra Stage is on"
//
stepmania/src/ScreenSelectMusic.cpp
-15
View File
@@ -1243,21 +1243,6 @@ void ScreenSelectMusic::MenuStart( PlayerNumber pn )
StartTransitioning( SM_BeginFadingOut );
}
}
if( GAMESTATE->IsExtraStage() && PREFSMAN->m_bPickExtraStage )
{
/* Check if user selected the real extra stage. */
Song* pSong;
Steps* pSteps;
SONGMAN->GetExtraStageInfo( false, GAMESTATE->GetCurrentStyle(), pSong, pSteps, NULL, NULL );
ASSERT(pSong);
/* Enable 2nd extra stage if user chose the correct song */
if( m_MusicWheel.GetSelectedSong() == pSong )
GAMESTATE->m_bAllow2ndExtraStage = true;
else
GAMESTATE->m_bAllow2ndExtraStage = false;
}
}