From 6badb0dd8cc32e23124bdfa4fc12a5c09ec21194 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 14 Jul 2005 05:12:56 +0000 Subject: [PATCH] transitioning m_bEditing -> m_EditMode, IsEditing() --- stepmania/src/ArrowEffects.cpp | 2 +- stepmania/src/GameState.cpp | 1 + stepmania/src/GameState.h | 2 ++ stepmania/src/NoteField.cpp | 2 +- stepmania/src/OptionRowHandler.cpp | 2 +- stepmania/src/Player.cpp | 4 ++-- stepmania/src/ScreenPlayerOptions.cpp | 4 ++-- stepmania/src/ScreenWithMenuElements.cpp | 2 +- stepmania/src/StepMania.cpp | 2 +- 9 files changed, 12 insertions(+), 9 deletions(-) diff --git a/stepmania/src/ArrowEffects.cpp b/stepmania/src/ArrowEffects.cpp index de8820f322..fbdbc10da4 100644 --- a/stepmania/src/ArrowEffects.cpp +++ b/stepmania/src/ArrowEffects.cpp @@ -488,7 +488,7 @@ float ArrowEffects::GetGlow( const PlayerState* pPlayerState, int iCol, float fY float ArrowEffects::GetBrightness( const PlayerState* pPlayerState, float fNoteBeat ) { - if( GAMESTATE->m_bEditing ) + if( GAMESTATE->IsEditing() ) return 1; float fSongBeat = GAMESTATE->m_fSongBeat; diff --git a/stepmania/src/GameState.cpp b/stepmania/src/GameState.cpp index 7fb89a8dbe..55395e27a3 100644 --- a/stepmania/src/GameState.cpp +++ b/stepmania/src/GameState.cpp @@ -185,6 +185,7 @@ void GameState::Reset() m_PreferredSortOrder = GetDefaultSort(); m_PlayMode = PLAY_MODE_INVALID; m_bEditing = false; + m_EditMode = EDIT_MODE_INVALID; m_bDemonstrationOrJukebox = false; m_bJukeboxUsesModifiers = false; m_iCurrentStageIndex = 0; diff --git a/stepmania/src/GameState.h b/stepmania/src/GameState.h index 8f1d9d6277..c2efcf9d40 100644 --- a/stepmania/src/GameState.h +++ b/stepmania/src/GameState.h @@ -108,6 +108,8 @@ public: 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 bool m_bJukeboxUsesModifiers; int m_iNumStagesOfThisSong; diff --git a/stepmania/src/NoteField.cpp b/stepmania/src/NoteField.cpp index ce401f1387..39cb99448b 100644 --- a/stepmania/src/NoteField.cpp +++ b/stepmania/src/NoteField.cpp @@ -479,7 +479,7 @@ void NoteField::DrawPrimitives() #define IS_ON_SCREEN( fBeat ) IsOnScreen( fBeat, iFirstPixelToDraw, iLastPixelToDraw ) - if( GAMESTATE->m_bEditing ) + if( GAMESTATE->IsEditing() ) { ASSERT(GAMESTATE->m_pCurSong); diff --git a/stepmania/src/OptionRowHandler.cpp b/stepmania/src/OptionRowHandler.cpp index 540225637b..95586d0fbb 100644 --- a/stepmania/src/OptionRowHandler.cpp +++ b/stepmania/src/OptionRowHandler.cpp @@ -289,7 +289,7 @@ public: defOut.m_bAllowThemeItems = false; // we theme the text ourself // fill in difficulty names - if( GAMESTATE->m_bEditing ) + if( GAMESTATE->IsEditing() ) { defOut.m_vsChoices.push_back( "" ); ListEntries.push_back( GameCommand() ); diff --git a/stepmania/src/Player.cpp b/stepmania/src/Player.cpp index a46051e3a4..b077f04b02 100644 --- a/stepmania/src/Player.cpp +++ b/stepmania/src/Player.cpp @@ -281,8 +281,8 @@ void Player::Load( const NoteData& noteData ) break; } - int iStartDrawingAtPixels = GAMESTATE->m_bEditing ? -100 : START_DRAWING_AT_PIXELS; - int iStopDrawingAtPixels = GAMESTATE->m_bEditing ? 400 : STOP_DRAWING_AT_PIXELS; + int iStartDrawingAtPixels = GAMESTATE->IsEditing() ? -100 : START_DRAWING_AT_PIXELS; + int iStopDrawingAtPixels = GAMESTATE->IsEditing() ? 400 : STOP_DRAWING_AT_PIXELS; float fNoteFieldMiddle = (GRAY_ARROWS_Y_STANDARD+GRAY_ARROWS_Y_REVERSE)/2; diff --git a/stepmania/src/ScreenPlayerOptions.cpp b/stepmania/src/ScreenPlayerOptions.cpp index 47be1bf598..7e8cd76a7a 100644 --- a/stepmania/src/ScreenPlayerOptions.cpp +++ b/stepmania/src/ScreenPlayerOptions.cpp @@ -26,11 +26,11 @@ void ScreenPlayerOptions::Init() ScreenOptionsMaster::Init(); m_bAskOptionsMessage = - !GAMESTATE->m_bEditing && PREFSMAN->m_ShowSongOptions == PrefsManager::ASK; + !GAMESTATE->IsEditing() && PREFSMAN->m_ShowSongOptions == PrefsManager::ASK; /* If we're going to "press start for more options" or skipping options * entirely, we need a different fade out. XXX: this is a hack */ - if( PREFSMAN->m_ShowSongOptions == PrefsManager::NO || GAMESTATE->m_bEditing ) + if( PREFSMAN->m_ShowSongOptions == PrefsManager::NO || GAMESTATE->IsEditing() ) { m_Out.Load( THEME->GetPathB("ScreenPlayerOptions","direct out") ); /* direct to stage */ } diff --git a/stepmania/src/ScreenWithMenuElements.cpp b/stepmania/src/ScreenWithMenuElements.cpp index 86283620e5..4bc6451115 100644 --- a/stepmania/src/ScreenWithMenuElements.cpp +++ b/stepmania/src/ScreenWithMenuElements.cpp @@ -184,7 +184,7 @@ void ScreenWithMenuElements::Update( float fDeltaTime ) void ScreenWithMenuElements::ResetTimer() { - if( TIMER_SECONDS > 0.0f && (PREFSMAN->m_bMenuTimer || FORCE_TIMER) && !GAMESTATE->m_bEditing ) + if( TIMER_SECONDS > 0.0f && (PREFSMAN->m_bMenuTimer || FORCE_TIMER) && !GAMESTATE->IsEditing() ) { m_MenuTimer->SetSeconds( TIMER_SECONDS ); m_MenuTimer->Start(); diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index c253c0ac63..5d9ab6d318 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -1310,7 +1310,7 @@ bool HandleGlobalInputs( DeviceInput DeviceI, InputEventType type, GameInput Gam case MENU_BUTTON_COIN: /* Handle a coin insertion. */ - if( GAMESTATE->m_bEditing ) // no coins while editing + if( GAMESTATE->IsEditing() ) // no coins while editing { LOG->Trace( "Ignored coin insertion (editing)" ); break;