[luadefs-server] Organise back-compat functions

multitheftauto · Sep 9, 2015 · 7cd5a1d · 7cd5a1d
1 parent 7b750d5
commit 7cd5a1d
Show file tree

Hide file tree

Showing 5 changed files with 29 additions and 37 deletions.
diff --git a/MTA10_Server/mods/deathmatch/logic/lua/CLuaManager.cpp b/MTA10_Server/mods/deathmatch/logic/lua/CLuaManager.cpp
@@ -552,5 +552,10 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaCFunctions::AddFunction ( "getPlayerAmmoInClip", CLuaPedDefs::GetPedAmmoInClip );
     CLuaCFunctions::AddFunction ( "getPedSkin", CLuaElementDefs::getElementModel );
     CLuaCFunctions::AddFunction ( "setPedSkin", CLuaElementDefs::setElementModel );
+    CLuaCFunctions::AddFunction ( "xmlNodeGetSubNodes", CLuaXMLDefs::xmlNodeGetChildren );
+    CLuaCFunctions::AddFunction ( "xmlCreateSubNode", CLuaXMLDefs::xmlCreateChild );
+    CLuaCFunctions::AddFunction ( "xmlFindSubNode", CLuaXMLDefs::xmlNodeFindChild );
+    CLuaCFunctions::AddFunction ( "attachElementToElement", CLuaElementDefs::attachElements );
+    CLuaCFunctions::AddFunction ( "detachElementFromElement", CLuaElementDefs::detachElements );
     // ** END OF BACKWARDS COMPATIBILITY FUNCS. **
 }
diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp
@@ -1,6 +1,6 @@
 /*****************************************************************************
 *
-*  PROJECT:     Multi Theft Auto v1.0
+*  PROJECT:     Multi Theft Auto v1.x
 *  LICENSE:     See LICENSE in the top level directory
 *  FILE:        mods/deathmatch/logic/luadefs/CLuaACLDefs.cpp
 *  PURPOSE:     Lua ACL function definitions class

diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaElementDefs.cpp
@@ -16,13 +16,6 @@
 
 void CLuaElementDefs::LoadFunctions ( void )
 {
-    // ** BACKWARDS COMPATIBILITY FUNCS. SHOULD BE REMOVED BEFORE FINAL RELEASE! **
-    CLuaCFunctions::AddFunction ( "attachElementToElement", attachElements );
-    CLuaCFunctions::AddFunction ( "detachElementFromElement", detachElements );
-    // ** END OF BACKWARDS COMPATIBILITY FUNCS. **
-
-
-
     // Create/destroy
     CLuaCFunctions::AddFunction ( "createElement", createElement );
     CLuaCFunctions::AddFunction ( "destroyElement", destroyElement );

diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaTextDefs.cpp
@@ -15,28 +15,28 @@
 
 void CLuaTextDefs::LoadFunctions ( void )
 {
-    CLuaCFunctions::AddFunction ( "textCreateDisplay", CLuaTextDefs::textCreateDisplay );
-    CLuaCFunctions::AddFunction ( "textDestroyDisplay", CLuaTextDefs::textDestroyDisplay );
-    CLuaCFunctions::AddFunction ( "textCreateTextItem", CLuaTextDefs::textCreateTextItem );
-    CLuaCFunctions::AddFunction ( "textDestroyTextItem", CLuaTextDefs::textDestroyTextItem );
-
-    CLuaCFunctions::AddFunction ( "textDisplayAddText", CLuaTextDefs::textDisplayAddText );
-    CLuaCFunctions::AddFunction ( "textDisplayRemoveText", CLuaTextDefs::textDisplayRemoveText );
-    CLuaCFunctions::AddFunction ( "textDisplayAddObserver", CLuaTextDefs::textDisplayAddObserver );
-    CLuaCFunctions::AddFunction ( "textDisplayRemoveObserver", CLuaTextDefs::textDisplayRemoveObserver );
-    CLuaCFunctions::AddFunction ( "textDisplayIsObserver", CLuaTextDefs::textDisplayIsObserver );
-    CLuaCFunctions::AddFunction ( "textDisplayGetObservers", CLuaTextDefs::textDisplayGetObservers );
-
-    CLuaCFunctions::AddFunction ( "textItemSetText", CLuaTextDefs::textItemSetText );
-    CLuaCFunctions::AddFunction ( "textItemGetText", CLuaTextDefs::textItemGetText );
-    CLuaCFunctions::AddFunction ( "textItemSetScale", CLuaTextDefs::textItemSetScale );
-    CLuaCFunctions::AddFunction ( "textItemGetScale", CLuaTextDefs::textItemGetScale );
-    CLuaCFunctions::AddFunction ( "textItemSetPosition", CLuaTextDefs::textItemSetPosition );
-    CLuaCFunctions::AddFunction ( "textItemGetPosition", CLuaTextDefs::textItemGetPosition );
-    CLuaCFunctions::AddFunction ( "textItemSetColor", CLuaTextDefs::textItemSetColor );
-    CLuaCFunctions::AddFunction ( "textItemGetColor", CLuaTextDefs::textItemGetColor );
-    CLuaCFunctions::AddFunction ( "textItemSetPriority", CLuaTextDefs::textItemSetPriority );
-    CLuaCFunctions::AddFunction ( "textItemGetPriority", CLuaTextDefs::textItemGetPriority );
+    CLuaCFunctions::AddFunction ( "textCreateDisplay", textCreateDisplay );
+    CLuaCFunctions::AddFunction ( "textDestroyDisplay", textDestroyDisplay );
+    CLuaCFunctions::AddFunction ( "textCreateTextItem", textCreateTextItem );
+    CLuaCFunctions::AddFunction ( "textDestroyTextItem", textDestroyTextItem );
+
+    CLuaCFunctions::AddFunction ( "textDisplayAddText", textDisplayAddText );
+    CLuaCFunctions::AddFunction ( "textDisplayRemoveText", textDisplayRemoveText );
+    CLuaCFunctions::AddFunction ( "textDisplayAddObserver", textDisplayAddObserver );
+    CLuaCFunctions::AddFunction ( "textDisplayRemoveObserver", textDisplayRemoveObserver );
+    CLuaCFunctions::AddFunction ( "textDisplayIsObserver", textDisplayIsObserver );
+    CLuaCFunctions::AddFunction ( "textDisplayGetObservers", textDisplayGetObservers );
+
+    CLuaCFunctions::AddFunction ( "textItemSetText", textItemSetText );
+    CLuaCFunctions::AddFunction ( "textItemGetText", textItemGetText );
+    CLuaCFunctions::AddFunction ( "textItemSetScale", textItemSetScale );
+    CLuaCFunctions::AddFunction ( "textItemGetScale", textItemGetScale );
+    CLuaCFunctions::AddFunction ( "textItemSetPosition", textItemSetPosition );
+    CLuaCFunctions::AddFunction ( "textItemGetPosition", textItemGetPosition );
+    CLuaCFunctions::AddFunction ( "textItemSetColor", textItemSetColor );
+    CLuaCFunctions::AddFunction ( "textItemGetColor", textItemGetColor );
+    CLuaCFunctions::AddFunction ( "textItemSetPriority", textItemSetPriority );
+    CLuaCFunctions::AddFunction ( "textItemGetPriority", textItemGetPriority );
 }
 
 void CLuaTextDefs::AddClasses ( lua_State* luaVM )

diff --git a/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp b/MTA10_Server/mods/deathmatch/logic/luadefs/CLuaXMLDefs.cpp
@@ -18,12 +18,6 @@
 
 void CLuaXMLDefs::LoadFunctions ( void )
 {
-    // ** BACKWARDS COMPATIBILITY FUNCS. SHOULD BE REMOVED BEFORE FINAL RELEASE! **
-    CLuaCFunctions::AddFunction ( "xmlNodeGetSubNodes", xmlNodeGetChildren );
-    CLuaCFunctions::AddFunction ( "xmlCreateSubNode", xmlCreateChild );
-    CLuaCFunctions::AddFunction ( "xmlFindSubNode", xmlNodeFindChild );
-    // ** END OF BACKWARDS COMPATIBILITY FUNCS. **
-
     CLuaCFunctions::AddFunction ( "xmlCreateFile", xmlCreateFile );
     CLuaCFunctions::AddFunction ( "xmlLoadFile", xmlLoadFile );
     CLuaCFunctions::AddFunction ( "xmlCopyFile", xmlCopyFile );
@@ -71,7 +65,7 @@ void CLuaXMLDefs::AddClass ( lua_State* luaVM )
     lua_classfunction ( luaVM, "getChildren", "xmlNodeGetChildren" );
     lua_classfunction ( luaVM, "getName", "xmlNodeGetName" );
     lua_classfunction ( luaVM, "getParent", "xmlNodeGetParent" );
-    lua_classfunction ( luaVM, "getAttribute", "xmlNodeGetAttribute" ); // table classvar?
+    lua_classfunction ( luaVM, "getAttribute", "xmlNodeGetAttribute" );
 
     lua_classvariable ( luaVM, "value", "xmlNodeSetValue", "xmlNodeGetValue" );
     lua_classvariable ( luaVM, "name", "xmlNodeSetName", "xmlNodeGetName" );