Make CLuaTimer, CLuaTimerManager shared

multitheftauto · Dec 28, 2017 · e89882a · e89882a
1 parent b76e23b
commit e89882a
Show file tree

Hide file tree

Showing 11 changed files with 14 additions and 224 deletions.
diff --git a/Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.h b/Client/mods/deathmatch/logic/lua/CLuaFunctionDefs.h
@@ -24,7 +24,7 @@ class CLuaFunctionDefinitions;
 
 #include "LuaCommon.h"
 #include "CLuaMain.h"
-#include "CLuaTimerManager.h"
+#include "lua/CLuaTimerManager.h"
 
 class CRegisteredCommands;
 

diff --git a/Client/mods/deathmatch/logic/lua/CLuaMain.h b/Client/mods/deathmatch/logic/lua/CLuaMain.h
@@ -17,7 +17,7 @@ class CLuaMain;
 
 #pragma once
 
-#include "CLuaTimerManager.h"
+#include "lua/CLuaTimerManager.h"
 #include "lua/CLuaVector2.h"
 #include "lua/CLuaVector3.h"
 #include "lua/CLuaVector4.h"

diff --git a/Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.h b/Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.h
@@ -32,7 +32,7 @@ class CAccessControlListManager;
 #pragma once
 #include "LuaCommon.h"
 #include "CLuaMain.h"
-#include "CLuaTimerManager.h"
+#include "lua/CLuaTimerManager.h"
 
 #define LUA_ERROR() lua_pushboolean ( luaVM, false ); return 0;
 #define LUA_DECLARE(x) static int x ( lua_State * luaVM ); 

diff --git a/Server/mods/deathmatch/logic/lua/CLuaMain.h b/Server/mods/deathmatch/logic/lua/CLuaMain.h
@@ -18,7 +18,7 @@
 class CLuaMain;
 
 #pragma once
-#include "CLuaTimerManager.h"
+#include "lua/CLuaTimerManager.h"
 #include "lua/CLuaVector2.h"
 #include "lua/CLuaVector3.h"
 #include "lua/CLuaVector4.h"

diff --git a/Server/mods/deathmatch/logic/lua/CLuaTimer.cpp b/Server/mods/deathmatch/logic/lua/CLuaTimer.cpp
diff --git a/Server/mods/deathmatch/logic/lua/CLuaTimer.h b/Server/mods/deathmatch/logic/lua/CLuaTimer.h
diff --git a/Server/mods/deathmatch/logic/lua/CLuaTimerManager.cpp b/Server/mods/deathmatch/logic/lua/CLuaTimerManager.cpp
@@ -1,15 +1,9 @@
 /*****************************************************************************
 *
-*  PROJECT:     Multi Theft Auto v1.0
+*  PROJECT:     Multi Theft Auto
 *  LICENSE:     See LICENSE in the top level directory
-*  FILE:        mods/deathmatch/logic/lua/CLuaTimerManager.cpp
+*  FILE:        Shared/mods/deathmatch/logic/lua/CLuaTimerManager.cpp
 *  PURPOSE:     Lua timer manager class
-*  DEVELOPERS:  Oliver Brown <>
-*               Christian Myhre Lundheim <>
-*               Jax <>
-*               Cecill Etheredge <>
-*               Marcus Bauer <mabako@gmail.com>
-*               Florian Busse <flobu@gmx.net>
 *
 *  Multi Theft Auto is available from http://www.multitheftauto.com/
 *

diff --git a/Server/mods/deathmatch/logic/lua/CLuaTimerManager.h b/Server/mods/deathmatch/logic/lua/CLuaTimerManager.h
diff --git a/...t/mods/deathmatch/logic/lua/CLuaTimer.cpp → ...d/mods/deathmatch/logic/lua/CLuaTimer.cpp b/...t/mods/deathmatch/logic/lua/CLuaTimer.cpp → ...d/mods/deathmatch/logic/lua/CLuaTimer.cpp
@@ -1,12 +1,9 @@
 /*****************************************************************************
 *
-*  PROJECT:     Multi Theft Auto v1.0
+*  PROJECT:     Multi Theft Auto
 *  LICENSE:     See LICENSE in the top level directory
-*  FILE:        mods/shared_logic/logic/lua/CLuaTimer.cpp
+*  FILE:        Shared/mods/shared_logic/logic/lua/CLuaTimer.cpp
 *  PURPOSE:     Lua timer class
-*  DEVELOPERS:  Ed Lyons <eai@opencoding.net>
-*               Jax <>
-*               Cecill Etheredge <ijsf@gmx.net>
 *
 *  Multi Theft Auto is available from http://www.multitheftauto.com/
 *

diff --git a/Client/mods/deathmatch/logic/lua/CLuaTimer.h → Shared/mods/deathmatch/logic/lua/CLuaTimer.h b/Client/mods/deathmatch/logic/lua/CLuaTimer.h → Shared/mods/deathmatch/logic/lua/CLuaTimer.h
@@ -1,22 +1,17 @@
 /*****************************************************************************
 *
-*  PROJECT:     Multi Theft Auto v1.0
+*  PROJECT:     Multi Theft Auto
 *  LICENSE:     See LICENSE in the top level directory
-*  FILE:        mods/shared_logic/logic/lua/CLuaTimer.h
+*  FILE:        Shared/mods/shared_logic/logic/lua/CLuaTimer.h
 *  PURPOSE:     Lua timer class
-*  DEVELOPERS:  Ed Lyons <eai@opencoding.net>
-*               Jax <>
-*               Cecill Etheredge <ijsf@gmx.net>
-*               Florian Busse <flobu@gmx.net>
 *
 *  Multi Theft Auto is available from http://www.multitheftauto.com/
 *
 *****************************************************************************/
 
 class CLuaTimer;
 
-#ifndef __CLUATIMER_H
-#define __CLUATIMER_H
+#pragma once
 
 // Define includes
 #include "LuaCommon.h"
@@ -59,5 +54,3 @@ class CLuaTimer
     uint                    m_uiScriptID;
     SLuaDebugInfo           m_LuaDebugInfo;
 };
-
-#endif
diff --git a/...s/deathmatch/logic/lua/CLuaTimerManager.h → ...s/deathmatch/logic/lua/CLuaTimerManager.h b/...s/deathmatch/logic/lua/CLuaTimerManager.h → ...s/deathmatch/logic/lua/CLuaTimerManager.h
@@ -1,21 +1,17 @@
 /*****************************************************************************
 *
-*  PROJECT:     Multi Theft Auto v1.0
+*  PROJECT:     Multi Theft Auto
 *  LICENSE:     See LICENSE in the top level directory
-*  FILE:        mods/shared_logic/logic/lua/CLuaTimerManager.h
+*  FILE:        Shared/mods/deathmatch/logic/lua/CLuaTimerManager.h
 *  PURPOSE:     Lua timer manager class
-*  DEVELOPERS:  Ed Lyons <eai@opencoding.net>
-*               Jax <>
-*               Cecill Etheredge <ijsf@gmx.net>
 *
 *  Multi Theft Auto is available from http://www.multitheftauto.com/
 *
 *****************************************************************************/
 
 class CLuaTimerManager;
 
-#ifndef __CLUATIMERMANAGER_H
-#define __CLUATIMERMANAGER_H
+#pragma once
 
 #include "LuaCommon.h"
 #include "CLuaTimer.h"
@@ -47,5 +43,3 @@ class CLuaTimerManager
     CLuaTimer*                  m_pPendingDelete;
     CLuaTimer*                  m_pProcessingTimer;
 };
-
-#endif