actions/itgmania212121
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

This is the only place GetMetricM is still used; remove it

Browse Source
This commit is contained in:
Glenn Maynard
2006-08-20 19:39:59 +00:00
parent df3245ebb5
commit f0b5e93621
1 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ScreenSelect.cpp
+6 -4
View File
@@ -12,10 +12,10 @@
#include "InputEventPlus.h" #include "InputEventPlus.h"
#define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames") #define CHOICE_NAMES THEME->GetMetric (m_sName,"ChoiceNames")
#define CHOICE( s ) THEME->GetMetricM(m_sName,ssprintf("Choice%s",s.c_str())) #define CHOICE( s ) THEME->GetMetric (m_sName,ssprintf("Choice%s",s.c_str()))
#define CODE_NAMES THEME->GetMetric (m_sName,"CodeNames") #define CODE_NAMES THEME->GetMetric (m_sName,"CodeNames")
#define CODE( s ) THEME->GetMetric (m_sName,ssprintf("Code%s",s.c_str())) #define CODE( s ) THEME->GetMetric (m_sName,ssprintf("Code%s",s.c_str()))
#define CODE_ACTION( s ) THEME->GetMetricM(m_sName,ssprintf("Code%sAction",s.c_str())) #define CODE_ACTION( s ) THEME->GetMetric (m_sName,ssprintf("Code%sAction",s.c_str()))
#define IDLE_TIMEOUT_SCREEN THEME->GetMetric (m_sName,"IdleTimeoutScreen") #define IDLE_TIMEOUT_SCREEN THEME->GetMetric (m_sName,"IdleTimeoutScreen")
#define UPDATE_ON_MESSAGE THEME->GetMetric (m_sName,"UpdateOnMessage") #define UPDATE_ON_MESSAGE THEME->GetMetric (m_sName,"UpdateOnMessage")
@@ -52,7 +52,8 @@ void ScreenSelect::Init()
GameCommand mc; GameCommand mc;
mc.ApplyCommitsScreens( false ); mc.ApplyCommitsScreens( false );
mc.m_sName = sChoiceName; mc.m_sName = sChoiceName;
mc.Load( c, CHOICE(sChoiceName) ); Commands cmd = ParseCommands( CHOICE(sChoiceName) );
mc.Load( c, cmd );
m_aGameCommands.push_back( mc ); m_aGameCommands.push_back( mc );
} }
} }
@@ -74,7 +75,8 @@ void ScreenSelect::Init()
m_aCodes.push_back( code ); m_aCodes.push_back( code );
GameCommand mc; GameCommand mc;
mc.Load( c, CODE_ACTION(sCodeName) ); Commands cmd = ParseCommands( CODE_ACTION(sCodeName) );
mc.Load( c, cmd );
m_aCodeChoices.push_back( mc ); m_aCodeChoices.push_back( mc );
} }
} }