This is the only place GetMetricM is still used; remove it
This commit is contained in:
@@ -12,10 +12,10 @@
|
||||
#include "InputEventPlus.h"
|
||||
|
||||
#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( 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 UPDATE_ON_MESSAGE THEME->GetMetric (m_sName,"UpdateOnMessage")
|
||||
|
||||
@@ -52,7 +52,8 @@ void ScreenSelect::Init()
|
||||
GameCommand mc;
|
||||
mc.ApplyCommitsScreens( false );
|
||||
mc.m_sName = sChoiceName;
|
||||
mc.Load( c, CHOICE(sChoiceName) );
|
||||
Commands cmd = ParseCommands( CHOICE(sChoiceName) );
|
||||
mc.Load( c, cmd );
|
||||
m_aGameCommands.push_back( mc );
|
||||
}
|
||||
}
|
||||
@@ -74,7 +75,8 @@ void ScreenSelect::Init()
|
||||
|
||||
m_aCodes.push_back( code );
|
||||
GameCommand mc;
|
||||
mc.Load( c, CODE_ACTION(sCodeName) );
|
||||
Commands cmd = ParseCommands( CODE_ACTION(sCodeName) );
|
||||
mc.Load( c, cmd );
|
||||
m_aCodeChoices.push_back( mc );
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user