cleanup, fix warning
This commit is contained in:
@@ -66,8 +66,8 @@ GameState::GameState() :
|
||||
m_PlayMode( Message_PlayModeChanged ),
|
||||
m_sPreferredSongGroup( Message_PreferredSongGroupChanged ),
|
||||
m_sPreferredCourseGroup(Message_PreferredCourseGroupChanged ),
|
||||
m_PreferredCourseDifficulty( Message_PreferredCourseDifficultyP1Changed ),
|
||||
m_PreferredDifficulty( Message_PreferredDifficultyP1Changed ),
|
||||
m_PreferredCourseDifficulty( Message_PreferredCourseDifficultyP1Changed ),
|
||||
m_SortOrder( Message_SortOrderChanged ),
|
||||
m_pCurSong( Message_CurrentSongChanged ),
|
||||
m_pCurSteps( Message_CurrentStepsP1Changed ),
|
||||
|
||||
@@ -59,7 +59,6 @@ public:
|
||||
int m_iCoins; // not "credits"
|
||||
PlayerNumber m_MasterPlayerNumber; // used in Styles where one player controls both sides
|
||||
bool m_bMultiplayer;
|
||||
BroadcastOnChange1D<CourseDifficulty,NUM_PLAYERS> m_PreferredCourseDifficulty;// used in nonstop
|
||||
bool DifficultiesLocked();
|
||||
bool ChangePreferredDifficulty( PlayerNumber pn, Difficulty dc );
|
||||
bool ChangePreferredDifficulty( PlayerNumber pn, int dir );
|
||||
@@ -107,6 +106,7 @@ public:
|
||||
BroadcastOnChange<CString> m_sPreferredCourseGroup; // GROUP_ALL denotes no preferred group
|
||||
bool m_bChangedFailTypeOnScreenSongOptions; // true if FailType was changed in the song options screen
|
||||
BroadcastOnChange1D<Difficulty,NUM_PLAYERS> m_PreferredDifficulty;
|
||||
BroadcastOnChange1D<CourseDifficulty,NUM_PLAYERS> m_PreferredCourseDifficulty;// used in nonstop
|
||||
BroadcastOnChange<SortOrder> m_SortOrder; // set by MusicWheel
|
||||
SortOrder m_PreferredSortOrder; // used by MusicWheel
|
||||
EditMode m_EditMode;
|
||||
|
||||
Reference in New Issue
Block a user