Hide QueryHandle class from global environment

multitheftauto · Sep 13, 2015 · a731d76 · a731d76
1 parent 2500ca4
commit a731d76
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/MTA10_Server/mods/deathmatch/logic/lua/LuaCommon.cpp b/MTA10_Server/mods/deathmatch/logic/lua/LuaCommon.cpp
@@ -357,7 +357,7 @@ void lua_getclass ( lua_State* luaVM, const char* szName )
 }
 
 
-void lua_registerclass ( lua_State* luaVM, const char* szName, const char* szParent )
+void lua_registerclass ( lua_State* luaVM, const char* szName, const char* szParent, bool bRegisterWithEnvironment )
 {
     if ( szParent != NULL )
     {
@@ -381,9 +381,10 @@ void lua_registerclass ( lua_State* luaVM, const char* szName, const char* szPar
 
     lua_pop ( luaVM, 1 );
 
-    // register with environment
-    lua_getfield ( luaVM, -1, "__class" );
-    lua_setglobal ( luaVM, szName );
+    if ( bRegisterWithEnvironment ) {
+        lua_getfield ( luaVM, -1, "__class" );
+        lua_setglobal ( luaVM, szName );
+    }
 
     lua_pop ( luaVM, 1 );
 }

diff --git a/MTA10_Server/mods/deathmatch/logic/lua/LuaCommon.h b/MTA10_Server/mods/deathmatch/logic/lua/LuaCommon.h
@@ -56,7 +56,7 @@ void                    lua_initclasses         ( lua_State* luaVM );
 
 void                    lua_newclass            ( lua_State* luaVM );
 void                    lua_getclass            ( lua_State* luaVM, const char* szName );
-void                    lua_registerclass       ( lua_State* luaVM, const char* szName, const char* szParent = NULL );
+void                    lua_registerclass       ( lua_State* luaVM, const char* szName, const char* szParent = NULL, bool bRegisterWithEnvironment = true);
 void                    lua_registerstaticclass ( lua_State* luaVM, const char* szName );
 void                    lua_classfunction       ( lua_State* luaVM, const char* szFunction, const char* szACLName, lua_CFunction fn );
 void                    lua_classfunction       ( lua_State* luaVM, const char* szFunction, const char* fn );

diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaDatabaseDefs.cpp
@@ -53,7 +53,7 @@ void CLuaDatabaseDefs::AddClass ( lua_State* luaVM )
     lua_classfunction ( luaVM, "poll", "dbPoll" );
     lua_classfunction ( luaVM, "free", "dbFree" );
 
-    lua_registerclass ( luaVM, "QueryHandle" );
+    lua_registerclass ( luaVM, "QueryHandle", NULL, false );
     //////////////////////////
 }