split out ThemeManager::PushMetric
This commit is contained in:
@@ -975,12 +975,10 @@ LuaReference ThemeManager::GetMetricR( const RString &sClassName, const RString
|
|||||||
return ref;
|
return ref;
|
||||||
}
|
}
|
||||||
|
|
||||||
void ThemeManager::GetMetric( const RString &sClassName, const RString &sValueName, LuaReference &valueOut )
|
void ThemeManager::PushMetric( Lua *L, const RString &sClassName, const RString &sValueName )
|
||||||
{
|
{
|
||||||
RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName );
|
RString sValue = GetMetricRaw( g_pLoadedThemeData->iniMetrics, sClassName, sValueName );
|
||||||
|
|
||||||
Lua *L = LUA->Get();
|
|
||||||
|
|
||||||
if( EndsWith(sValueName, "Command") )
|
if( EndsWith(sValueName, "Command") )
|
||||||
{
|
{
|
||||||
ActorUtil::ParseActorCommands( L, sValue );
|
ActorUtil::ParseActorCommands( L, sValue );
|
||||||
@@ -990,7 +988,12 @@ void ThemeManager::GetMetric( const RString &sClassName, const RString &sValueNa
|
|||||||
LuaHelpers::PrepareExpression( sValue );
|
LuaHelpers::PrepareExpression( sValue );
|
||||||
LuaHelpers::RunExpression( L, sValue );
|
LuaHelpers::RunExpression( L, sValue );
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
void ThemeManager::GetMetric( const RString &sClassName, const RString &sValueName, LuaReference &valueOut )
|
||||||
|
{
|
||||||
|
Lua *L = LUA->Get();
|
||||||
|
PushMetric( L, sClassName, sValueName );
|
||||||
valueOut.SetFromStack( L );
|
valueOut.SetFromStack( L );
|
||||||
LUA->Release( L );
|
LUA->Release( L );
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -70,6 +70,7 @@ public:
|
|||||||
void ClearThemePathCache();
|
void ClearThemePathCache();
|
||||||
|
|
||||||
bool HasMetric( const RString &sClassName, const RString &sValueName );
|
bool HasMetric( const RString &sClassName, const RString &sValueName );
|
||||||
|
void PushMetric( Lua *L, const RString &sClassName, const RString &sValueName );
|
||||||
RString GetMetric( const RString &sClassName, const RString &sValueName );
|
RString GetMetric( const RString &sClassName, const RString &sValueName );
|
||||||
int GetMetricI( const RString &sClassName, const RString &sValueName );
|
int GetMetricI( const RString &sClassName, const RString &sValueName );
|
||||||
float GetMetricF( const RString &sClassName, const RString &sValueName );
|
float GetMetricF( const RString &sClassName, const RString &sValueName );
|
||||||
|
|||||||
Reference in New Issue
Block a user