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

fix enums

Browse Source
This commit is contained in:
Glenn Maynard
2006-10-06 00:46:46 +00:00
parent c80451fe46
commit c2a88f95cc
1 changed files with 12 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stepmania/src/LuaManager.cpp
+12 -27
View File
@@ -274,26 +274,6 @@ XNode *LuaManager::GetLuaInformation() const
{ {
case LUA_TTABLE: case LUA_TTABLE:
{ {
// Check for the metatable.
if( !lua_getmetatable(L, -1) )
{
/* If the key ends in "Index", check for the non "Index" version.
* If both exist, then we have found an enum. */
if( !EndsWith(sKey, "Index") || sKey.size() <= 5 )
break;
sKey = sKey.substr( 0, sKey.size() - 5 );
LuaHelpers::Push( L, sKey );
lua_rawget( L, LUA_GLOBALSINDEX );
if( lua_istable(L, -1) )
{
vector<RString> &vEnum = mEnums[sKey];
LuaHelpers::ReadArrayFromTable( vEnum, L );
}
lua_pop( L, 2 ); // pop table and key
break;
}
lua_pop( L, 1 ); // pop metatable
if( luaL_getmetafield(L, -1, "class") ) if( luaL_getmetafield(L, -1, "class") )
{ {
const char *name = lua_tostring( L, -1 ); const char *name = lua_tostring( L, -1 );
@@ -334,14 +314,19 @@ XNode *LuaManager::GetLuaInformation() const
// fall through // fall through
case LUA_TUSERDATA: // table or userdata: class instance case LUA_TUSERDATA: // table or userdata: class instance
{ {
if( luaL_getmetafield(L, -1, "type") ) if( !luaL_getmetafield(L, -1, "type") )
break;
RString sType;
if( !LuaHelpers::Pop(L, sType) )
break;
if( sType == "Enum" )
{ {
const char *type = lua_tostring( L, -1 ); vector<RString> &vEnum = mEnums[sKey];
LuaHelpers::ReadArrayFromTable( vEnum, L );
if( type ) }
mSingletons[sKey] = type; else
{
lua_pop( L, 1 ); // pop type mSingletons[sKey] = sType;
} }
break; break;