diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index dc7a5c0ea0..3e6b14e9b8 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1035,6 +1035,7 @@ StaticBGY=SCREEN_CENTER_Y+0 StaticBGX=SCREEN_CENTER_X+0 PrevScreen=@SongSelectionScreen() NextScreen=@GetGameplayNextScreen() +PlayerType=Player InitialBackgroundBrightness=1 BPMDisplayX=-1000 BPMDisplayY=-1000 diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 4f1a8f0cfa..ebfef85179 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -58,8 +58,8 @@ #define SHOW_SCORE_IN_RAVE THEME->GetMetricB(m_sName,"ShowScoreInRave") #define SONG_POSITION_METER_WIDTH THEME->GetMetricF(m_sName,"SongPositionMeterWidth") #define PLAYER_X( p, styleType ) THEME->GetMetricF(m_sName,ssprintf("PlayerP%d%sX",p+1,StyleTypeToString(styleType).c_str())) -static ThemeMetric INITIAL_BACKGROUND_BRIGHTNESS ("ScreenGameplay","InitialBackgroundBrightness"); +static ThemeMetric INITIAL_BACKGROUND_BRIGHTNESS ("ScreenGameplay","InitialBackgroundBrightness"); static ThemeMetric SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBetweenComments"); static ThemeMetric TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds"); @@ -89,6 +89,7 @@ static Preference g_fNetStartOffset( Options, "NetworkStartOffset", -3.0 REGISTER_SCREEN_CLASS( ScreenGameplay ); ScreenGameplay::ScreenGameplay( CString sName ) : Screen(sName) { + PLAYER_TYPE.Load( sName, "PlayerType" ); } void ScreenGameplay::Init() @@ -823,7 +824,7 @@ void ScreenGameplay::SetupSong( PlayerNumber p, int iSongIndex ) NoteData nd = ndTransformed; NoteDataUtil::RemoveAllTapsOfType( nd, TapNote::autoKeysound ); m_Player[p].Init( - "Player", + PLAYER_TYPE, GAMESTATE->m_pPlayerState[p], &STATSMAN->m_CurStageStats.m_player[p], m_pLifeMeter[p], diff --git a/stepmania/src/ScreenGameplay.h b/stepmania/src/ScreenGameplay.h index acb21c090b..8dc6218456 100644 --- a/stepmania/src/ScreenGameplay.h +++ b/stepmania/src/ScreenGameplay.h @@ -161,6 +161,8 @@ protected: BeginnerHelper m_BeginnerHelper; NoteData m_CabinetLightsNoteData; + + ThemeMetric PLAYER_TYPE; };