From e7f5a8fb2d4989a35ed9ff684d81aa5b0faf06c7 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Sat, 29 Apr 2006 00:41:30 +0000 Subject: [PATCH] cleanup --- stepmania/src/GameState.h | 42 +++++++++++++++++++-------------------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h index 1e9fd05671..4e50f85db8 100644 --- a/stepmania/src/GameState.h +++ b/stepmania/src/GameState.h @@ -59,7 +59,7 @@ public: MultiPlayerStatus m_MultiPlayerStatus[NUM_MultiPlayer]; BroadcastOnChange m_PlayMode; // many screens display different info depending on this value int m_iCoins; // not "credits" - PlayerNumber m_MasterPlayerNumber; // used in Styles where one player controls both sides + PlayerNumber m_MasterPlayerNumber; // used in Styles where one player controls both sides bool m_bMultiplayer; bool DifficultiesLocked(); bool ChangePreferredDifficulty( PlayerNumber pn, Difficulty dc ); @@ -103,34 +103,34 @@ public: bool ShowW1() const; - RString m_sLoadingMessage; // used in loading screen - BroadcastOnChange m_sPreferredSongGroup; // GROUP_ALL denotes no preferred group + RString m_sLoadingMessage; // used in loading screen + BroadcastOnChange m_sPreferredSongGroup; // GROUP_ALL denotes no preferred group BroadcastOnChange m_sPreferredCourseGroup; // GROUP_ALL denotes no preferred group - bool m_bChangedFailTypeOnScreenSongOptions; // true if FailType was changed in the song options screen - BroadcastOnChange1D m_PreferredDifficulty; + bool m_bChangedFailTypeOnScreenSongOptions; // true if FailType was changed in the song options screen + BroadcastOnChange1D m_PreferredDifficulty; BroadcastOnChange1D m_PreferredCourseDifficulty;// used in nonstop - BroadcastOnChange m_SortOrder; // set by MusicWheel - SortOrder m_PreferredSortOrder; // used by MusicWheel - EditMode m_EditMode; - bool IsEditing() const { return m_EditMode != EditMode_INVALID; } - bool m_bDemonstrationOrJukebox; // ScreenGameplay does special stuff when this is true - bool m_bJukeboxUsesModifiers; + BroadcastOnChange m_SortOrder; // set by MusicWheel + SortOrder m_PreferredSortOrder; // used by MusicWheel + EditMode m_EditMode; + bool IsEditing() const { return m_EditMode != EditMode_INVALID; } + bool m_bDemonstrationOrJukebox; // ScreenGameplay does special stuff when this is true + bool m_bJukeboxUsesModifiers; int m_iNumStagesOfThisSong; int m_iCurrentStageIndex; int GetStageIndex() const; - void BeginStage(); - void CancelStage(); - void CommitStageStats(); - void FinishStage(); + void BeginStage(); + void CancelStage(); + void CommitStageStats(); + void FinishStage(); int GetNumStagesLeft() const; - bool IsFinalStage() const; - bool IsExtraStage() const; - bool IsExtraStage2() const; - Stage GetCurrentStage() const; - bool IsStagePossible( Stage s ) const; + bool IsFinalStage() const; + bool IsExtraStage() const; + bool IsExtraStage2() const; + Stage GetCurrentStage() const; + bool IsStagePossible( Stage s ) const; int GetCourseSongIndex() const; - RString GetPlayerDisplayName( PlayerNumber pn ) const; + RString GetPlayerDisplayName( PlayerNumber pn ) const; //