From a7039d9eec9f0f3d55fe419a8764b387bc0e1304 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 14 Jul 2005 05:14:49 +0000 Subject: [PATCH] remove m_bEditing --- stepmania/src/GameState.cpp | 1 - stepmania/src/GameState.h | 1 - stepmania/src/ScreenEdit.cpp | 4 ++-- 3 files changed, 2 insertions(+), 4 deletions(-) diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 55395e27a3..21aa0db5b0 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -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; diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h index c2efcf9d40..a619049b93 100644 --- a/stepmania/src/GameState.h +++ b/stepmania/src/GameState.h @@ -107,7 +107,6 @@ public: BroadcastOnChange1D 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 diff --git a/stepmania/src/ScreenEdit.cpp b/stepmania/src/ScreenEdit.cpp index 2bcf475d54..1806f3ac52 100644 --- a/stepmania/src/ScreenEdit.cpp +++ b/stepmania/src/ScreenEdit.cpp @@ -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 ) {