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

style cleanup

Browse Source
This commit is contained in:
Chris Danford
2005-12-25 19:27:31 +00:00
parent 236a727d64
commit 7a76b58bd3
3 changed files with 5 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/StepMania.cpp
+1 -3
View File
@@ -918,9 +918,7 @@ static void ApplyLogPreferences()
static CString LocalizeString( const CString &sSection, const CString &s ) static CString LocalizeString( const CString &sSection, const CString &s )
{ {
CString sOut; return THEME->GetString( sSection, s );
THEME->GetString( sSection, s, sOut );
return sOut;
} }
static LocalizedString COULDNT_OPEN_LOADING_WINDOW( "StepMania", "Couldn't open any loading windows." ); static LocalizedString COULDNT_OPEN_LOADING_WINDOW( "StepMania", "Couldn't open any loading windows." );
stepmania/src/ThemeManager.cpp
+3 -3
View File
@@ -899,10 +899,10 @@ void ThemeManager::GetMetric( const CString &sClassName, const CString &sValueNa
valueOut.SetFromExpression( "function(self) " + sValue + "end" ); valueOut.SetFromExpression( "function(self) " + sValue + "end" );
} }
void ThemeManager::GetString( const CString &sClassName, const CString &sValueName, CString &valueOut ) CString ThemeManager::GetString( const CString &sClassName, const CString &sValueName )
{ {
// TODO: Change this to GetMetricRaw and write stubs for missing strings into every language file. // TODO: Change this to GetMetricRaw and write stubs for missing strings into every language file.
valueOut = GetMetric( sClassName, sValueName ); return GetMetric( sClassName, sValueName );
} }
void ThemeManager::GetMetricsThatBeginWith( const CString &sClassName_, const CString &sValueName, set<CString> &vsValueNamesOut ) void ThemeManager::GetMetricsThatBeginWith( const CString &sClassName_, const CString &sValueName, set<CString> &vsValueNamesOut )
@@ -948,7 +948,7 @@ public:
LunaThemeManager() { LUA->Register( Register ); } LunaThemeManager() { LUA->Register( Register ); }
static int GetMetric( T* p, lua_State *L ) { lua_pushstring(L, p->GetMetric(SArg(1),SArg(2)) ); return 1; } static int GetMetric( T* p, lua_State *L ) { lua_pushstring(L, p->GetMetric(SArg(1),SArg(2)) ); return 1; }
static int GetString( T* p, lua_State *L ) { CString s; p->GetString(SArg(1),SArg(2),s); lua_pushstring(L,s); return 1; } static int GetString( T* p, lua_State *L ) { lua_pushstring(L, p->GetString(SArg(1),SArg(2)) ); return 1; }
static int GetPathG( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathG(SArg(1),SArg(2)) ); return 1; } static int GetPathG( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathG(SArg(1),SArg(2)) ); return 1; }
static int GetPathB( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathB(SArg(1),SArg(2)) ); return 1; } static int GetPathB( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathB(SArg(1),SArg(2)) ); return 1; }
static int GetPathS( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathS(SArg(1),SArg(2)) ); return 1; } static int GetPathS( T* p, lua_State *L ) { lua_pushstring(L, p->GetPathS(SArg(1),SArg(2)) ); return 1; }
stepmania/src/ThemeManager.h
+1 -1
View File
@@ -81,7 +81,7 @@ public:
void GetMetric( const CString &sClassName, const CString &sValueName, LuaExpression &valueOut ); void GetMetric( const CString &sClassName, const CString &sValueName, LuaExpression &valueOut );
void GetMetric( const CString &sClassName, const CString &sValueName, apActorCommands &valueOut ); void GetMetric( const CString &sClassName, const CString &sValueName, apActorCommands &valueOut );
void GetString( const CString &sClassName, const CString &sValueName, CString &valueOut ); CString GetString( const CString &sClassName, const CString &sValueName );
void GetMetricsThatBeginWith( const CString &sClassName, const CString &sValueName, set<CString> &vsValueNamesOut ); void GetMetricsThatBeginWith( const CString &sClassName, const CString &sValueName, set<CString> &vsValueNamesOut );