diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index c72cc10b4e..f1375531c0 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -963,6 +963,7 @@ CourseSongNumberX=0 CourseSongNumberY=0 CourseSongNumberOnCommand=hidden,1 CourseSongNumberOffCommand= +ShowScoreInRave=1 ScoreP1X=106 ScoreP1Y=444 ScoreP1OnCommand=addy,100;sleep,0.5;linear,1;addy,-100 diff --git a/stepmania/src/ScreenGameplay.cpp b/stepmania/src/ScreenGameplay.cpp index 155f20679c..905c39f2f8 100644 --- a/stepmania/src/ScreenGameplay.cpp +++ b/stepmania/src/ScreenGameplay.cpp @@ -55,6 +55,7 @@ #define NEXT_SCREEN( play_mode ) THEME->GetMetric ("ScreenGameplay","NextScreen"+Capitalize(PlayModeToString(play_mode))) #define SHOW_LIFE_METER_FOR_DISABLED_PLAYERS THEME->GetMetricB("ScreenGameplay","ShowLifeMeterForDisabledPlayers") #define EVAL_ON_FAIL THEME->GetMetricB("ScreenGameplay","ShowEvaluationOnFail") +#define SHOW_SCORE_IN_RAVE THEME->GetMetricB("ScreenGameplay","ShowScoreInRave") CachedThemeMetricF SECONDS_BETWEEN_COMMENTS ("ScreenGameplay","SecondsBetweenComments"); CachedThemeMetricF G_TICK_EARLY_SECONDS ("ScreenGameplay","TickEarlySeconds"); @@ -442,7 +443,8 @@ ScreenGameplay::ScreenGameplay( CString sName, bool bDemonstration ) : Screen("S m_pPrimaryScoreDisplay[p]->Init( (PlayerNumber)p ); m_pPrimaryScoreDisplay[p]->SetName( ssprintf("ScoreP%d%s",p+1,bExtra?"Extra":"") ); SET_XY( *m_pPrimaryScoreDisplay[p] ); - this->AddChild( m_pPrimaryScoreDisplay[p] ); + if( GAMESTATE->m_PlayMode != PLAY_MODE_RAVE || SHOW_SCORE_IN_RAVE ) /* XXX: ugly */ + this->AddChild( m_pPrimaryScoreDisplay[p] ); //