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

GetModifierNames: use vector not set for easier interaction with Lua

Browse Source
This commit is contained in:
Chris Danford
2005-05-22 15:03:03 +00:00
parent ab69380599
commit cac3d56730
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/CatalogXml.cpp
+2 -2
View File
@@ -305,9 +305,9 @@ void SaveCatalogXml( LoadingWindow *loading_window )
} }
{ {
set<CString> modifiers; vector<CString> modifiers;
THEME->GetModifierNames( modifiers ); THEME->GetModifierNames( modifiers );
for( set<CString>::const_iterator iter = modifiers.begin(); iter != modifiers.end(); iter++ ) FOREACH_CONST( CString, modifiers, iter )
{ {
XNode* pNode2 = pNode->AppendChild( "Modifier", *iter ); XNode* pNode2 = pNode->AppendChild( "Modifier", *iter );
PlayerOptions po; PlayerOptions po;
stepmania/src/ThemeManager.cpp
+7 -4
View File
@@ -808,7 +808,7 @@ CString ThemeManager::GetPathToG( const CString &sFileName, bool bOptional ) { C
CString ThemeManager::GetPathToS( const CString &sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathS(sClassName,sElement,bOptional); } CString ThemeManager::GetPathToS( const CString &sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathS(sClassName,sElement,bOptional); }
CString ThemeManager::GetPathToO( const CString &sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathO(sClassName,sElement,bOptional); } CString ThemeManager::GetPathToO( const CString &sFileName, bool bOptional ) { CString sClassName, sElement; FileNameToClassAndElement(sFileName,sClassName,sElement); return GetPathO(sClassName,sElement,bOptional); }
void ThemeManager::GetModifierNames( set<CString>& AddTo ) void ThemeManager::GetModifierNames( vector<CString>& AddTo )
{ {
for( deque<Theme>::const_iterator iter = g_vThemes.begin(); for( deque<Theme>::const_iterator iter = g_vThemes.begin();
iter != g_vThemes.end(); iter != g_vThemes.end();
@@ -818,7 +818,7 @@ void ThemeManager::GetModifierNames( set<CString>& AddTo )
if( cur ) if( cur )
{ {
FOREACH_CONST_Attr( cur, p ) FOREACH_CONST_Attr( cur, p )
AddTo.insert( p->m_sName ); AddTo.push_back( p->m_sName );
} }
} }
} }
@@ -911,13 +911,16 @@ class LunaThemeManager : public Luna<T>
public: 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 GetPath( T* p, lua_State *L ) { lua_pushstring(L, p->GetPath((ElementCategory)IArg(1),SArg(2),SArg(3)) ); return 1; } static int GetPath( T* p, lua_State *L ) { lua_pushstring(L, p->GetPath((ElementCategory)IArg(1),SArg(2),SArg(3)) ); return 1; }
static int GetModifierNames( T* p, lua_State *L ) { vector<CString> v; p->GetModifierNames(v); LuaHelpers::CreateTableFromArray(v,LUA->L); return 1; }
static void Register(lua_State *L) static void Register(lua_State *L)
{ {
ADD_METHOD( GetMetric ) ADD_METHOD( GetMetric )
ADD_METHOD( GetPath ) ADD_METHOD( GetPath )
ADD_METHOD( GetModifierNames )
Luna<T>::Register( L ); Luna<T>::Register( L );
// Add global singleton if constructed already. If it's not constructed yet, // Add global singleton if constructed already. If it's not constructed yet,
stepmania/src/ThemeManager.h
+1 -1
View File
@@ -48,7 +48,7 @@ public:
CString GetCurThemeDir() const { return GetThemeDirFromName(m_sCurThemeName); }; CString GetCurThemeDir() const { return GetThemeDirFromName(m_sCurThemeName); };
void NextTheme(); void NextTheme();
void ReloadMetrics(); void ReloadMetrics();
void GetModifierNames( set<CString>& AddTo ); void GetModifierNames( vector<CString>& AddTo );
static void EvaluateString( CString &sText ); static void EvaluateString( CString &sText );