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

Parse F theme metrics as Lua expressions. I'll regroup LuaHelpers as a singleton subsystem soon.

Browse Source
This commit is contained in:
Chris Danford
2004-09-22 04:55:31 +00:00
parent 1ec8cbb208
commit 21871f7c3d
5 changed files with 93 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/ThemeManager.cpp
+11 -8
View File
@@ -17,6 +17,7 @@
#include "StepMania.h"
#include "Foreach.h"
#include "ThemeMetric.h"
#include "LuaHelpers.h"
ThemeManager* THEME = NULL; // global object accessable from anywhere in the program
@@ -247,6 +248,8 @@ void ThemeManager::SwitchThemeAndLanguage( CString sThemeName, CString sLanguage
// reload subscribers
FOREACH( IThemeMetric*, *g_pvpSubscribers, p ) (*p)->Read();
Lua::UpdateGlobals();
}
CString ThemeManager::GetThemeDirFromName( const CString &sThemeName )
@@ -611,19 +614,19 @@ int ThemeManager::GetMetricI( CString sClassName, CString sValueName )
float ThemeManager::GetMetricF( CString sClassName, CString sValueName )
{
return strtof( GetMetricRaw(sClassName,sValueName), NULL );
const CString str = GetMetricRaw( sClassName,sValueName );
return Lua::RunExpressionF( str );
}
// #include "LuaHelpers.h"
bool ThemeManager::GetMetricB( CString sClassName, CString sValueName )
{
// const CString str = GetMetricRaw( sClassName,sValueName );
// if( str == "0" )
// return false; /* optimization */
// if( str == "1" )
// return true; /* optimization */
// return Lua::RunExpression( str );
return atoi( GetMetricRaw(sClassName,sValueName) ) != 0;
const CString str = GetMetricRaw( sClassName,sValueName );
if( str == "0" )
return false; /* optimization */
if( str == "1" )
return true; /* optimization */
return Lua::RunExpressionB( str );
}
RageColor ThemeManager::GetMetricC( CString sClassName, CString sValueName )