Rebased branch

TracerDS · Feb 5, 2024 · b2571d6 · b2571d6
1 parent db8018a
commit b2571d6
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 11 deletions.
diff --git a/Shared/mods/deathmatch/logic/lua/CLuaShared.cpp b/Shared/mods/deathmatch/logic/lua/CLuaShared.cpp
@@ -86,6 +86,7 @@ void CLuaShared::LoadFunctions()
 void CLuaShared::AddClasses(lua_State* luaVM)
 {
     CLuaFileDefs::AddClass(luaVM);
+    CLuaPathDefs::AddClass(luaVM);
     CLuaXMLDefs::AddClass(luaVM);
 }
 

diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaPathDefs.cpp b/Shared/mods/deathmatch/logic/luadefs/CLuaPathDefs.cpp
@@ -37,13 +37,9 @@ void CLuaPathDefs::AddClass(lua_State* luaVM)
 {
     lua_newclass(luaVM);
 
-#ifdef MTA_CLIENT
-    lua_classfunction(luaVM, "listDir", CLuaPathDefs::pathListDir);
-#else
-    lua_classfunction(luaVM, "listDir", "pathListDir", CLuaPathDefs::pathListDir);
-#endif
-    lua_classfunction(luaVM, "isFile", CLuaPathDefs::pathIsFile);
-    lua_classfunction(luaVM, "isDirectory", CLuaPathDefs::pathIsDirectory);
+    lua_classfunction(luaVM, "listDir", "pathListDir");
+    lua_classfunction(luaVM, "isFile", "pathIsFile");
+    lua_classfunction(luaVM, "isDirectory", "pathIsDirectory");
 
     lua_registerclass(luaVM, "path");
 }
@@ -66,7 +62,7 @@ std::optional<std::vector<std::string>> CLuaPathDefs::pathListDir(lua_State* lua
     return SharedUtil::ListDir(strAbsPath);
 }
 
-bool CLuaPathDefs::isFile(lua_State* luaVM, std::string path)
+bool CLuaPathDefs::pathIsFile(lua_State* luaVM, std::string path)
 {
     CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
     if (!pLuaMain)
@@ -81,7 +77,7 @@ bool CLuaPathDefs::isFile(lua_State* luaVM, std::string path)
     return SharedUtil::FileExists(strAbsPath);
 }
 
-bool CLuaPathDefs::isDirectory(lua_State* luaVM, std::string path)
+bool CLuaPathDefs::pathIsDirectory(lua_State* luaVM, std::string path)
 {
     CLuaMain* pLuaMain = m_pLuaManager->GetVirtualMachine(luaVM);
     if (!pLuaMain)
@@ -94,4 +90,4 @@ bool CLuaPathDefs::isDirectory(lua_State* luaVM, std::string path)
         return false;
 
     return SharedUtil::DirectoryExists(strAbsPath);
-}
+}
diff --git a/Shared/mods/deathmatch/logic/luadefs/CLuaPathDefs.h b/Shared/mods/deathmatch/logic/luadefs/CLuaPathDefs.h
@@ -11,7 +11,7 @@
 #pragma once
 #include "luadefs/CLuaDefs.h"
 
-class CLuaFileDefs : public CLuaDefs
+class CLuaPathDefs : public CLuaDefs
 {
 public:
     static void LoadFunctions();