remove m_bEditing
This commit is contained in:
@@ -184,7 +184,6 @@ void GameState::Reset()
|
||||
m_SortOrder = SORT_INVALID;
|
||||
m_PreferredSortOrder = GetDefaultSort();
|
||||
m_PlayMode = PLAY_MODE_INVALID;
|
||||
m_bEditing = false;
|
||||
m_EditMode = EDIT_MODE_INVALID;
|
||||
m_bDemonstrationOrJukebox = false;
|
||||
m_bJukeboxUsesModifiers = false;
|
||||
|
||||
@@ -107,7 +107,6 @@ public:
|
||||
BroadcastOnChange1D<Difficulty,NUM_PLAYERS> m_PreferredDifficulty;
|
||||
SortOrder m_SortOrder; // set by MusicWheel
|
||||
SortOrder m_PreferredSortOrder; // used by MusicWheel
|
||||
bool m_bEditing; // NoteField does special stuff when this is true
|
||||
EditMode m_EditMode;
|
||||
bool IsEditing() const { return m_EditMode != EDIT_MODE_INVALID; }
|
||||
bool m_bDemonstrationOrJukebox; // ScreenGameplay does special stuff when this is true
|
||||
|
||||
@@ -576,7 +576,7 @@ void ScreenEdit::Init()
|
||||
|
||||
|
||||
GAMESTATE->m_bPastHereWeGo = false;
|
||||
GAMESTATE->m_bEditing = true;
|
||||
GAMESTATE->m_EditMode = EDIT_MODE.GetValue();
|
||||
GAMESTATE->m_fSongBeat = 0;
|
||||
m_fTrailingBeat = GAMESTATE->m_fSongBeat;
|
||||
|
||||
@@ -1686,7 +1686,7 @@ void ScreenEdit::HandleScreenMessage( const ScreenMessage SM )
|
||||
}
|
||||
else if( SM == SM_GoToNextScreen )
|
||||
{
|
||||
GAMESTATE->m_bEditing = false;
|
||||
GAMESTATE->m_EditMode = EDIT_MODE_INVALID;
|
||||
}
|
||||
else if( SM == SM_BackFromMainMenu )
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user