From 2b7c8a8d5ec2647994cb3eba1ea6a07471c0e54c Mon Sep 17 00:00:00 2001 From: Chris Danford Date: Sat, 8 May 2004 08:09:47 +0000 Subject: [PATCH] add metric to capitalize difficulty names --- stepmania/src/DifficultyList.cpp | 13 +++++++++++-- stepmania/src/DifficultyList.h | 1 + 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/stepmania/src/DifficultyList.cpp b/stepmania/src/DifficultyList.cpp index 7230101cc0..0997a4adda 100644 --- a/stepmania/src/DifficultyList.cpp +++ b/stepmania/src/DifficultyList.cpp @@ -16,6 +16,7 @@ #define NUM_SHOWN_ITEMS THEME->GetMetricI(m_sName,"NumShownItems") #define MOVE_COMMAND THEME->GetMetric (m_sName,"MoveCommand") #define DIFFICULTIES_TO_SHOW THEME->GetMetric( "Common","DifficultiesToShow" ) +#define CAPITALIZE_DIFFICULTY_NAMES THEME->GetMetric( m_sName,"CapitalizeDifficultyNames" ) #define MAX_METERS NUM_DIFFICULTIES + MAX_EDITS_PER_SONG @@ -300,7 +301,7 @@ void DifficultyList::SetFromGameState() m_Lines[i].m_Meter.SetMeter( 3*(d), d ); m_Lines[i].m_Number.SetText( "?" ); - m_Lines[i].m_Description.SetText( DifficultyToThemedString(d) ); + m_Lines[i].m_Description.SetText( GetDifficultyString(d) ); } } else @@ -326,7 +327,7 @@ void DifficultyList::SetFromGameState() if( row.m_Steps->GetDifficulty() == DIFFICULTY_EDIT ) s = row.m_Steps->GetDescription(); else - s = DifficultyToThemedString(row.m_dc); + s = GetDifficultyString(row.m_dc); m_Lines[i].m_Description.SetMaxWidth( DESCRIPTION_MAX_WIDTH ); m_Lines[i].m_Description.SetText( s ); /* Don't mess with alpha; it might be fading on. */ @@ -416,6 +417,14 @@ void DifficultyList::Hide() } } +CString DifficultyList::GetDifficultyString( Difficulty d ) const +{ + CString s = DifficultyToThemedString( d ); + if( CAPITALIZE_DIFFICULTY_NAMES ) + s.MakeUpper(); + return s; +} + /* * Copyright (c) 2003-2004 by the person(s) listed below. All rights reserved. * Glenn Maynard diff --git a/stepmania/src/DifficultyList.h b/stepmania/src/DifficultyList.h index 8fe5a5a603..457046ba53 100644 --- a/stepmania/src/DifficultyList.h +++ b/stepmania/src/DifficultyList.h @@ -28,6 +28,7 @@ private: void PositionItems(); int GetCurrentRowIndex( PlayerNumber pn ) const; void HideRows(); + CString GetDifficultyString( Difficulty d ) const; AutoActor m_Cursors[NUM_PLAYERS]; ActorFrame m_CursorFrames[NUM_PLAYERS];