[luadefs-server] Clean up Timer

Author: qaisjp

MTA10_Server/mods/deathmatch/Makefile.am

@@ -200,7 +200,6 @@ LOGIC = \
 ./logic/lua/CLuaFunctionDefs.PREG.cpp \
 ./logic/lua/CLuaFunctionDefs.RadarArea.cpp \
 ./logic/lua/CLuaFunctionDefs.Server.cpp \
-./logic/lua/CLuaFunctionDefs.Timer.cpp \
 ./logic/lua/CLuaFunctionDefs.UTF.cpp \
 ./logic/lua/CLuaFunctionDefs.Utility.cpp \
 ./logic/lua/CLuaFunctionDefs.Weapon.cpp \
@@ -239,6 +238,7 @@ LOGIC = \
 ./logic/luadefs/CLuaResourceDefs.cpp \
 ./logic/luadefs/CLuaTeamDefs.cpp \
 ./logic/luadefs/CLuaTextDefs.cpp \
+./logic/luadefs/CLuaTimerDefs.cpp \
 ./logic/luadefs/CLuaVector2Defs.cpp \
 ./logic/luadefs/CLuaVector3Defs.cpp \
 ./logic/luadefs/CLuaVector4Defs.cpp \

MTA10_Server/mods/deathmatch/StdInc.h

@@ -127,6 +127,7 @@ struct SAclRequest;
 #include "luadefs/CLuaResourceDefs.h"
 #include "luadefs/CLuaTeamDefs.h"
 #include "luadefs/CLuaTextDefs.h"
+#include "luadefs/CLuaTimerDefs.h"
 #include "luadefs/CLuaWaterDefs.h"
 #include "luadefs/CLuaWorldDefs.h"
 #include "luadefs/CLuaVehicleDefs.h"

MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj

@@ -456,6 +456,7 @@
     <ClCompile Include="logic\luadefs\CLuaPedDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaPlayerDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaTeamDefs.cpp" />
+    <ClCompile Include="logic\luadefs\CLuaTimerDefs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaVector2Defs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaVector3Defs.cpp" />
     <ClCompile Include="logic\luadefs\CLuaVector4Defs.cpp" />
@@ -473,7 +474,6 @@
     <ClCompile Include="logic\lua\CLuaFunctionDefs.PREG.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.RadarArea.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Server.cpp" />
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Timer.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.UTF.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Utility.cpp" />
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Weapon.cpp" />
@@ -886,6 +886,7 @@
     <ClInclude Include="logic\luadefs\CLuaPedDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaPlayerDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaTeamDefs.h" />
+    <ClInclude Include="logic\luadefs\CLuaTimerDefs.h" />
     <ClInclude Include="logic\luadefs\CLuaVector2Defs.h" />
     <ClInclude Include="logic\luadefs\CLuaVector3Defs.h" />
     <ClInclude Include="logic\luadefs\CLuaVector4Defs.h" />

MTA10_Server/mods/deathmatch/_ServerDeathmatch 2008.vcxproj.filters

@@ -957,9 +957,6 @@
     <ClCompile Include="logic\lua\CLuaFunctionDefs.PREG.cpp">
       <Filter>Source Files\logic\lua</Filter>
     </ClCompile>
-    <ClCompile Include="logic\lua\CLuaFunctionDefs.Timer.cpp">
-      <Filter>Source Files\logic\lua</Filter>
-    </ClCompile>
     <ClCompile Include="logic\lua\CLuaFunctionDefs.Clothing.cpp">
       <Filter>Source Files\logic\lua</Filter>
     </ClCompile>
@@ -993,6 +990,9 @@
     <ClCompile Include="logic\luadefs\CLuaWaterDefs.cpp">
       <Filter>Source Files\logic\luadefs</Filter>
     </ClCompile>
+    <ClCompile Include="logic\luadefs\CLuaTimerDefs.cpp">
+      <Filter>Source Files\logic\luadefs</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="logic\CLightsyncManager.h">
@@ -1877,6 +1877,9 @@
     <ClInclude Include="logic\luadefs\CLuaWaterDefs.h">
       <Filter>Header Files\logic\luadefs</Filter>
     </ClInclude>
+    <ClInclude Include="logic\luadefs\CLuaTimerDefs.h">
+      <Filter>Header Files\logic\luadefs</Filter>
+    </ClInclude>
   </ItemGroup>
   <ItemGroup>
     <Xml Include="acl.xml">

MTA10_Server/mods/deathmatch/logic/lua/CLuaFunctionDefs.h

@@ -183,12 +183,6 @@ class CLuaFunctionDefs
     LUA_DECLARE ( GetCTime );
     LUA_DECLARE ( Split );
     LUA_DECLARE ( GetTok );
-    LUA_DECLARE ( SetTimer );
-    LUA_DECLARE ( KillTimer );
-    LUA_DECLARE ( ResetTimer );
-    LUA_DECLARE ( GetTimers );
-    LUA_DECLARE ( IsTimer );
-    LUA_DECLARE ( GetTimerDetails );
     LUA_DECLARE ( GetColorFromString );
     LUA_DECLARE ( Reference );
     LUA_DECLARE ( Dereference );

MTA10_Server/mods/deathmatch/logic/lua/CLuaMain.cpp

@@ -311,23 +311,6 @@ void CLuaMain::AddQueryHandleClass ( lua_State* luaVM )
 }
 
 
-void CLuaMain::AddTimerClass ( lua_State* luaVM )
-{
-    lua_newclass ( luaVM );
-    
-    lua_classfunction ( luaVM, "create", "setTimer" );
-    lua_classfunction ( luaVM, "destroy", "killTimer" );
-    lua_classfunction ( luaVM, "reset", "resetTimer" );
-    lua_classfunction ( luaVM, "isValid", "isTimer" );
-    
-    lua_classfunction ( luaVM, "getDetails", "getTimerDetails" );
-    
-    lua_classvariable ( luaVM, "valid", NULL, "isTimer" );
-    
-    lua_registerclass ( luaVM, "Timer" );
-}
-
-
 void CLuaMain::InitClasses ( lua_State* luaVM )
 {
     lua_initclasses             ( luaVM );
@@ -362,14 +345,14 @@ void CLuaMain::InitClasses ( lua_State* luaVM )
     CLuaBlipDefs        ::AddClass   ( luaVM );
     CLuaTeamDefs        ::AddClass   ( luaVM );
     CLuaWaterDefs       ::AddClass   ( luaVM );
+    CLuaTimerDefs       ::AddClass   ( luaVM );
     AddAccountClass             ( luaVM );
     AddBanClass                 ( luaVM );
     AddColShapeClass            ( luaVM );
     AddObjectClass              ( luaVM );
     AddRadarAreaClass           ( luaVM );
     AddConnectionClass          ( luaVM );
     AddQueryHandleClass         ( luaVM );
-    AddTimerClass               ( luaVM );
 }
 
 

MTA10_Server/mods/deathmatch/logic/lua/CLuaMain.h

@@ -134,7 +134,6 @@ class CLuaMain //: public CClient
     void                            AddRadarAreaClass       ( lua_State* luaVM );
     void                            AddConnectionClass      ( lua_State* luaVM );
     void                            AddQueryHandleClass     ( lua_State* luaVM );
-    void                            AddTimerClass           ( lua_State* luaVM );
 
     bool                            IsOOPEnabled            ( void )                        { return m_bEnableOOP; }
 private:

MTA10_Server/mods/deathmatch/logic/lua/CLuaManager.cpp

@@ -301,12 +301,6 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaCFunctions::AddFunction ( "getRealTime", CLuaFunctionDefs::GetCTime );
     CLuaCFunctions::AddFunction ( "split", CLuaFunctionDefs::Split );
     CLuaCFunctions::AddFunction ( "gettok", CLuaFunctionDefs::GetTok );
-    CLuaCFunctions::AddFunction ( "setTimer", CLuaFunctionDefs::SetTimer );
-    CLuaCFunctions::AddFunction ( "killTimer", CLuaFunctionDefs::KillTimer );
-    CLuaCFunctions::AddFunction ( "resetTimer", CLuaFunctionDefs::ResetTimer );
-    CLuaCFunctions::AddFunction ( "getTimers", CLuaFunctionDefs::GetTimers );
-    CLuaCFunctions::AddFunction ( "isTimer", CLuaFunctionDefs::IsTimer );
-    CLuaCFunctions::AddFunction ( "getTimerDetails", CLuaFunctionDefs::GetTimerDetails );
     CLuaCFunctions::AddFunction ( "getColorFromString", CLuaFunctionDefs::GetColorFromString );
     CLuaCFunctions::AddFunction ( "ref", CLuaFunctionDefs::Reference );
     CLuaCFunctions::AddFunction ( "deref", CLuaFunctionDefs::Dereference );
@@ -347,6 +341,7 @@ void CLuaManager::LoadCFunctions ( void )
     CLuaBlipDefs::LoadFunctions ();
     CLuaTeamDefs::LoadFunctions ();
     CLuaWaterDefs::LoadFunctions ();
+    CLuaTimerDefs::LoadFunctions ();
 
     // All-Seeing Eye Functions
     CLuaCFunctions::AddFunction ( "getGameType", CLuaFunctionDefs::GetGameType );