From f701c3f261acba264b0d3a5163e2a4057ce52a38 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Thu, 19 May 2005 21:05:25 +0000 Subject: [PATCH] remove unused FirstRunInitialScreen --- stepmania/src/CommonMetrics.cpp | 1 - stepmania/src/CommonMetrics.h | 1 - stepmania/src/StepMania.cpp | 11 +---------- 3 files changed, 1 insertion(+), 12 deletions(-) diff --git a/stepmania/src/CommonMetrics.cpp b/stepmania/src/CommonMetrics.cpp index ed0fe2aec7..f0219bc81b 100644 --- a/stepmania/src/CommonMetrics.cpp +++ b/stepmania/src/CommonMetrics.cpp @@ -10,7 +10,6 @@ CString PLAYER_COLOR_NAME( size_t p ) { return ssprintf("ColorP%d",int(p+1)); } ThemeMetric INITIAL_SCREEN ("Common","InitialScreen"); -ThemeMetric FIRST_RUN_INITIAL_SCREEN ("Common","FirstRunInitialScreen"); ThemeMetric DEFAULT_MODIFIERS ("Common","DefaultModifiers" ); ThemeMetric DEFAULT_CPU_MODIFIERS ("Common","DefaultCpuModifiers" ); ThemeMetric1D PLAYER_COLOR ("Common",PLAYER_COLOR_NAME,NUM_PLAYERS); diff --git a/stepmania/src/CommonMetrics.h b/stepmania/src/CommonMetrics.h index d87d1518e3..c7c2655d83 100644 --- a/stepmania/src/CommonMetrics.h +++ b/stepmania/src/CommonMetrics.h @@ -53,7 +53,6 @@ public: // Metrics // extern ThemeMetric INITIAL_SCREEN; -extern ThemeMetric FIRST_RUN_INITIAL_SCREEN; extern ThemeMetric DEFAULT_MODIFIERS; extern ThemeMetric DEFAULT_CPU_MODIFIERS; extern ThemeMetric1D PLAYER_COLOR; diff --git a/stepmania/src/StepMania.cpp b/stepmania/src/StepMania.cpp index 4b50909f48..4fe72a3b6a 100644 --- a/stepmania/src/StepMania.cpp +++ b/stepmania/src/StepMania.cpp @@ -315,16 +315,7 @@ void ResetGame( bool ReturnToFirstScreen ) if( ReturnToFirstScreen ) - { - if( PREFSMAN->m_bFirstRun ) - SCREENMAN->SetNewScreen( FIRST_RUN_INITIAL_SCREEN ); - else - SCREENMAN->SetNewScreen( INITIAL_SCREEN ); - - PREFSMAN->m_bFirstRun.Set( false ); - PREFSMAN->SaveGlobalPrefsToDisk(); // persist FirstRun setting in case we don't exit normally - } - + SCREENMAN->SetNewScreen( INITIAL_SCREEN ); } static void GameLoop();