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

remove m_bEditing

Browse Source
This commit is contained in:
Glenn Maynard
2005-07-14 05:14:49 +00:00
parent 6badb0dd8c
commit a7039d9eec
3 changed files with 2 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/GameState.cpp
-1
View File
@@ -184,7 +184,6 @@ void GameState::Reset()
m_SortOrder = SORT_INVALID; m_SortOrder = SORT_INVALID;
m_PreferredSortOrder = GetDefaultSort(); m_PreferredSortOrder = GetDefaultSort();
m_PlayMode = PLAY_MODE_INVALID; m_PlayMode = PLAY_MODE_INVALID;
m_bEditing = false;
m_EditMode = EDIT_MODE_INVALID; m_EditMode = EDIT_MODE_INVALID;
m_bDemonstrationOrJukebox = false; m_bDemonstrationOrJukebox = false;
m_bJukeboxUsesModifiers = false; m_bJukeboxUsesModifiers = false;
stepmania/src/GameState.h
-1
View File
@@ -107,7 +107,6 @@ public:
BroadcastOnChange1D<Difficulty,NUM_PLAYERS> m_PreferredDifficulty; BroadcastOnChange1D<Difficulty,NUM_PLAYERS> m_PreferredDifficulty;
SortOrder m_SortOrder; // set by MusicWheel SortOrder m_SortOrder; // set by MusicWheel
SortOrder m_PreferredSortOrder; // used by MusicWheel SortOrder m_PreferredSortOrder; // used by MusicWheel
bool m_bEditing; // NoteField does special stuff when this is true
EditMode m_EditMode; EditMode m_EditMode;
bool IsEditing() const { return m_EditMode != EDIT_MODE_INVALID; } bool IsEditing() const { return m_EditMode != EDIT_MODE_INVALID; }
bool m_bDemonstrationOrJukebox; // ScreenGameplay does special stuff when this is true bool m_bDemonstrationOrJukebox; // ScreenGameplay does special stuff when this is true
stepmania/src/ScreenEdit.cpp
+2 -2
View File
@@ -576,7 +576,7 @@ void ScreenEdit::Init()
GAMESTATE->m_bPastHereWeGo = false; GAMESTATE->m_bPastHereWeGo = false;
GAMESTATE->m_bEditing = true; GAMESTATE->m_EditMode = EDIT_MODE.GetValue();
GAMESTATE->m_fSongBeat = 0; GAMESTATE->m_fSongBeat = 0;
m_fTrailingBeat = GAMESTATE->m_fSongBeat; m_fTrailingBeat = GAMESTATE->m_fSongBeat;
@@ -1686,7 +1686,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
} }
else if( SM == SM_GoToNextScreen ) else if( SM == SM_GoToNextScreen )
{ {
GAMESTATE->m_bEditing = false; GAMESTATE->m_EditMode = EDIT_MODE_INVALID;
} }
else if( SM == SM_BackFromMainMenu ) else if( SM == SM_BackFromMainMenu )
{ {