From 8ff02634394241b3cd3da16c5a1c7ca46e896e49 Mon Sep 17 00:00:00 2001 From: Glenn Maynard Date: Tue, 28 Feb 2006 01:19:06 +0000 Subject: [PATCH] add AllowCenter1Player metric --- stepmania/Themes/default/metrics.ini | 1 + stepmania/src/ScreenGameplay.cpp | 2 ++ stepmania/src/ScreenGameplay.h | 1 + 3 files changed, 4 insertions(+) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index 22c60b7403..97960a6231 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -915,6 +915,7 @@ GivingUpGoesToNextScreen=0 InitialBackgroundBrightness=1 MusicFadeOutSeconds=0.5 UseForcedModifiersInBeginner=0 +AllowCenter1Player=1 ForcedModifiersInBeginner= SongBackgroundOnCommand= SongForegroundOnCommand= diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index e2f717a8a6..6509d1cde8 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -368,6 +368,7 @@ void ScreenGameplay::Init( bool bUseSongBackgroundAndForeground ) GIVING_UP_GOES_TO_NEXT_SCREEN.Load( m_sName, "GivingUpGoesToNextScreen" ); FAIL_AFTER_30_MISSES.Load( m_sName, "FailAfter30Misses" ); USE_FORCED_MODIFIERS_IN_BEGINNER.Load( m_sName, "UseForcedModifiersInBeginner" ); + ALLOW_CENTER_1_PLAYER.Load( m_sName, "AllowCenter1Player" ); FORCED_MODIFIERS_IN_BEGINNER.Load( m_sName, "ForcedModifiersInBeginner" ); if( bUseSongBackgroundAndForeground ) @@ -492,6 +493,7 @@ void ScreenGameplay::Init( bool bUseSongBackgroundAndForeground ) * but for now just ignore Center1Player when it's Battle or Rave * Mode. This doesn't begin to address two-player solo (6 arrows) */ if( g_bCenter1Player && + ALLOW_CENTER_1_PLAYER && GAMESTATE->m_PlayMode != PLAY_MODE_BATTLE && GAMESTATE->m_PlayMode != PLAY_MODE_RAVE && GAMESTATE->GetCurrentStyle()->m_StyleType == ONE_PLAYER_ONE_SIDE ) diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index 00ae039731..8aecd1b9ce 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -127,6 +127,7 @@ protected: ThemeMetric GIVING_UP_GOES_TO_NEXT_SCREEN; ThemeMetric FAIL_AFTER_30_MISSES; ThemeMetric USE_FORCED_MODIFIERS_IN_BEGINNER; + ThemeMetric ALLOW_CENTER_1_PLAYER; ThemeMetric FORCED_MODIFIERS_IN_BEGINNER; void TweenOnScreen();