From 774befb052bfb980140147a3f1b74d43086ebb62 Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Wed, 30 Apr 2008 10:57:53 +0000 Subject: [PATCH] add PlayerOptionsHideFailType --- stepmania/Themes/default/metrics.ini | 1 + stepmania/src/ScreenEvaluation.cpp | 6 +++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/stepmania/Themes/default/metrics.ini b/stepmania/Themes/default/metrics.ini index d622969172..1b63042d70 100644 --- a/stepmania/Themes/default/metrics.ini +++ b/stepmania/Themes/default/metrics.ini @@ -1164,6 +1164,7 @@ StageDisplayStageToShow=SCREENMAN:GetTopScreen():GetStageStats():GetStage() Summary=false TimerSeconds=15 PlayerOptionsSeparator="," +PlayerOptionsHideFailType=false MaxComboNumDigits=4 ShowStyleIcon=true ShowBannerArea=true diff --git a/stepmania/src/ScreenEvaluation.cpp b/stepmania/src/ScreenEvaluation.cpp index 234f681660..e99c309930 100644 --- a/stepmania/src/ScreenEvaluation.cpp +++ b/stepmania/src/ScreenEvaluation.cpp @@ -69,6 +69,7 @@ XToString( DetailLine ); #define SHOW_TIME_AREA THEME->GetMetricB(m_sName,"ShowTimeArea") #define SHOW_RECORDS_AREA THEME->GetMetricB(m_sName,"ShowRecordsArea") #define MAX_COMBO_NUM_DIGITS THEME->GetMetricI(m_sName,"MaxComboNumDigits") +#define PLAYER_OPTIONS_HIDE_FAIL_TYPE THEME->GetMetricB(m_sName,"PlayerOptionsHideFailType") #define PLAYER_OPTIONS_SEPARATOR THEME->GetMetric (m_sName,"PlayerOptionsSeparator") @@ -324,7 +325,10 @@ void ScreenEvaluation::Init() ActorUtil::LoadAllCommands( m_textPlayerOptions[p], m_sName ); SET_XY( m_textPlayerOptions[p] ); vector v; - GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.GetStage().GetLocalizedMods( v ); + PlayerOptions po = GAMESTATE->m_pPlayerState[p]->m_PlayerOptions.GetCurrent(); + if( PLAYER_OPTIONS_HIDE_FAIL_TYPE ) + po.m_FailType = (PlayerOptions::FailType)0; // blank out the fail type so that it won't show in the mods list + po.GetLocalizedMods( v ); RString sPO = join( PLAYER_OPTIONS_SEPARATOR, v ); m_textPlayerOptions[p].SetText( sPO ); this->AddChild( &m_textPlayerOptions[p] );