Fix crash on map change (#74)

danielga · Oct 17, 2021 · 2e074b9 · 2e074b9
1 parent 19c6938
commit 2e074b9
Show file tree

Hide file tree

Showing 8 changed files with 747 additions and 645 deletions.
diff --git a/source/main.hpp → source/debug.hpp b/source/main.hpp → source/debug.hpp
@@ -1,10 +1,5 @@
 #pragma once
 
-#include <GarrysMod/FactoryLoader.hpp>
-
-#include <string>
-#include <vector>
-
 #if defined DEBUG
 
 #include <dbg.h>
@@ -19,10 +14,3 @@
 #define _DebugWarning( ... )
 
 #endif
-
-class IServer;
-
-namespace global
-{
-	extern IServer *server;
-}
diff --git a/source/filecheck.cpp b/source/filecheck.cpp
@@ -1,5 +1,5 @@
 #include "filecheck.hpp"
-#include "main.hpp"
+#include "debug.hpp"
 
 #include <GarrysMod/Lua/Interface.h>
 #include <GarrysMod/Lua/Helpers.hpp>
@@ -162,7 +162,7 @@ namespace filecheck
 		LUA->SetField( -2, "EnableFileValidation" );
 	}
 
-	void Deinitialize( GarrysMod::Lua::ILuaBase * )
+	void Deinitialize( )
 	{
 		hook.Destroy( );
 	}

diff --git a/source/filecheck.hpp b/source/filecheck.hpp
@@ -11,5 +11,5 @@ namespace GarrysMod
 namespace filecheck
 {
 	void Initialize( GarrysMod::Lua::ILuaBase *LUA );
-	void Deinitialize( GarrysMod::Lua::ILuaBase *LUA );
+	void Deinitialize( );
 }
diff --git a/source/main.cpp b/source/main.cpp
@@ -1,4 +1,3 @@
-#include "main.hpp"
 #include "netfilter/core.hpp"
 #include "filecheck.hpp"
 
@@ -10,8 +9,7 @@
 
 namespace global
 {
-	SourceSDK::FactoryLoader engine_loader( "engine" );
-	IServer *server = nullptr;
+	static IServer *server = nullptr;
 
 	LUA_FUNCTION_STATIC( GetClientCount )
 	{
@@ -27,11 +25,11 @@ namespace global
 
 		LUA->CreateTable( );
 
-		LUA->PushString( "serversecure 1.5.37" );
+		LUA->PushString( "serversecure 1.5.38" );
 		LUA->SetField( -2, "Version" );
 
 		// version num follows LuaJIT style, xxyyzz
-		LUA->PushNumber( 10537 );
+		LUA->PushNumber( 10538 );
 		LUA->SetField( -2, "VersionNum" );
 
 		LUA->PushCFunction( GetClientCount );
@@ -61,8 +59,8 @@ GMOD_MODULE_OPEN( )
 
 GMOD_MODULE_CLOSE( )
 {
-	filecheck::Deinitialize( LUA );
-	netfilter::Deinitialize( LUA );
+	filecheck::Deinitialize( );
+	netfilter::Deinitialize( );
 	global::Deinitialize( LUA );
 	return 0;
 }
diff --git a/source/netfilter/client.cpp b/source/netfilter/client.cpp
@@ -1,6 +1,6 @@
 #include "client.hpp"
 #include "clientmanager.hpp"
-#include "main.hpp"
+#include "debug.hpp"
 
 namespace netfilter
 {

diff --git a/source/netfilter/clientmanager.cpp b/source/netfilter/clientmanager.cpp
@@ -1,5 +1,5 @@
 #include "clientmanager.hpp"
-#include "main.hpp"
+#include "debug.hpp"
 
 namespace netfilter
 {