Move CLuaTimer to Shared (PR #2991)

multitheftauto · Jul 25, 2023 · b742076 · b742076
1 parent b01fcd2
commit b742076
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 130 deletions.
diff --git a/Client/mods/deathmatch/logic/lua/CLuaTimer.cpp b/Client/mods/deathmatch/logic/lua/CLuaTimer.cpp
diff --git a/Client/mods/deathmatch/logic/lua/CLuaTimer.h b/Client/mods/deathmatch/logic/lua/CLuaTimer.h
diff --git a/Client/mods/deathmatch/logic/lua/CLuaTimerManager.h b/Client/mods/deathmatch/logic/lua/CLuaTimerManager.h
@@ -14,7 +14,7 @@ class CLuaTimerManager;
 #pragma once
 
 #include "LuaCommon.h"
-#include "CLuaTimer.h"
+#include "lua/CLuaTimer.h"
 #include <list>
 
 class CLuaTimerManager

diff --git a/Server/mods/deathmatch/logic/lua/CLuaTimerManager.h b/Server/mods/deathmatch/logic/lua/CLuaTimerManager.h
@@ -14,7 +14,7 @@ class CLuaTimerManager;
 #pragma once
 
 #include "LuaCommon.h"
-#include "CLuaTimer.h"
+#include "lua/CLuaTimer.h"
 #include <list>
 
 class CLuaTimerManager

diff --git a/...r/mods/deathmatch/logic/lua/CLuaTimer.cpp → ...d/mods/deathmatch/logic/lua/CLuaTimer.cpp b/...r/mods/deathmatch/logic/lua/CLuaTimer.cpp → ...d/mods/deathmatch/logic/lua/CLuaTimer.cpp
@@ -9,10 +9,13 @@
  *
  *****************************************************************************/
 
-#include "StdInc.h"
-#include "CLuaTimer.h"
-#include "CLuaMain.h"
-#include "CIdArray.h"
+#include <StdInc.h>
+
+#ifndef MTA_CLIENT
+    #include "CLuaTimer.h"
+    #include "lua/CLuaMain.h"
+    #include "CIdArray.h"
+#endif
 
 CLuaTimer::CLuaTimer(const CLuaFunctionRef& iLuaFunction, const CLuaArguments& Arguments)
 {

diff --git a/Server/mods/deathmatch/logic/lua/CLuaTimer.h → Shared/mods/deathmatch/logic/lua/CLuaTimer.h b/Server/mods/deathmatch/logic/lua/CLuaTimer.h → Shared/mods/deathmatch/logic/lua/CLuaTimer.h
@@ -14,10 +14,10 @@ class CLuaTimer;
 #pragma once
 
 // Define includes
-#include "LuaCommon.h"
-#include "CLuaArguments.h"
+#include "lua/LuaCommon.h"
+#include "lua/CLuaArguments.h"
 
-#define LUA_TIMER_MIN_INTERVAL 0
+#define LUA_TIMER_MIN_INTERVAL      0
 
 class CLuaTimer
 {