From c057421fcaf285d1c221a17404bbae5e86c163ee Mon Sep 17 00:00:00 2001
From: David Anderson <dvander@alliedmods.net>
Date: Mon, 8 Oct 2007 17:22:57 +0000
Subject: [PATCH] builds against new sourcehook now

--HG--
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40477
---
 sourcemm/Makefile.ep2        | 4 ++--
 sourcemm/metamod.cpp         | 5 +++--
 sourcemm/metamod.h           | 3 ++-
 sourcemm/metamod_console.cpp | 4 ++--
 4 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/sourcemm/Makefile.ep2 b/sourcemm/Makefile.ep2
index 7325686..c352732 100644
--- a/sourcemm/Makefile.ep2
+++ b/sourcemm/Makefile.ep2
@@ -38,7 +38,7 @@ GCC_VERSION := $(shell $(CPP) -dumpversion >&1 | cut -b1)
 CFLAGS += -D_LINUX -DNDEBUG -Dstricmp=strcasecmp -D_stricmp=strcasecmp -D_strnicmp=strncasecmp \
 	-Dstrnicmp=strncasecmp -D_snprintf=snprintf -D_vsnprintf=vsnprintf -D_alloca=alloca \
 	-Dstrcmpi=strcasecmp -Wall -Wno-non-virtual-dtor -Werror -fPIC -fno-exceptions -fno-rtti -msse \
-	-fno-strict-aliasing
+	-fno-strict-aliasing -Wno-uninitialized
 
 ifeq "$(GCC_VERSION)" "4"
 	CFLAGS += $(GCC4_FLAGS)
@@ -55,7 +55,7 @@ all:
 	ln -sf $(SRCDS)/bin/vstdlib_i486.so vstdlib_i486.so
 	ln -sf $(SRCDS)/bin/tier0_i486.so tier0_i486.so
 	ln -sf $(SMM_ROOT)/sourcehook/sourcehook.cpp sourcehook.cpp
-	ln -sf $(HL2SDK)/tier1/convar.cpp episode2/convar.cpp
+	ln -sf ../$(HL2SDK)/tier1/convar.cpp episode2/convar.cpp
 	$(MAKE) -f Makefile.ep2 sourcemm
 	rm -rf $(BINARY)
 	ln -sf $(BIN_DIR)/$(BINARY) $(BINARY)
diff --git a/sourcemm/metamod.cpp b/sourcemm/metamod.cpp
index ef13bd7..3b708a6 100644
--- a/sourcemm/metamod.cpp
+++ b/sourcemm/metamod.cpp
@@ -44,6 +44,7 @@
 
 using namespace SourceMM;
 using namespace SourceHook;
+using namespace SourceHook::Impl;
 
 /**
  * @brief Implementation of main SourceMM GameDLL functionality
@@ -92,8 +93,8 @@ CreateInterfaceFn engine_factory = NULL;
 CreateInterfaceFn physics_factory = NULL;
 CreateInterfaceFn filesystem_factory = NULL;
 CGlobalVars *gpGlobals = NULL;
-SourceHook::CSourceHookImpl g_SourceHook;
-SourceHook::ISourceHook *g_SHPtr = &g_SourceHook;
+CSourceHookImpl g_SourceHook;
+ISourceHook *g_SHPtr = &g_SourceHook;
 PluginId g_PLID = Pl_Console;
 META_RES last_meta_res;
 IServerPluginCallbacks *vsp_callbacks = NULL;
diff --git a/sourcemm/metamod.h b/sourcemm/metamod.h
index 54a46af..a41f30e 100644
--- a/sourcemm/metamod.h
+++ b/sourcemm/metamod.h
@@ -101,7 +101,8 @@ public:
 void LogMessage(const char *msg, ...);
 int LoadPluginsFromFile(const char *_file);
 
-extern SourceHook::CSourceHookImpl g_SourceHook;
 extern MetamodSource g_Metamod;
+extern SourceHook::Impl::CSourceHookImpl g_SourceHook;
 
 #endif //_INCLUDE_SOURCEMM_H
+
diff --git a/sourcemm/metamod_console.cpp b/sourcemm/metamod_console.cpp
index a9c2742..7de2763 100644
--- a/sourcemm/metamod_console.cpp
+++ b/sourcemm/metamod_console.cpp
@@ -73,7 +73,7 @@ bool Command_Meta(IMetamodSourceCommandInfo *info)
 			CONMSG("Metamod:Source version %s\n", SOURCEMM_VERSION);
 			CONMSG("Compiled on: %s\n", SOURCEMM_DATE);
 			CONMSG("Plugin interface version: %d:%d\n", PLAPI_VERSION, PLAPI_MIN_VERSION);
-			CONMSG("SourceHook version: %d:%d\n", g_SourceHook.GetIfaceVersion(), g_SourceHook.GetImplVersion());
+			CONMSG("SourceHook version: %d:%d\n", g_SHPtr->GetIfaceVersion(), g_SHPtr->GetImplVersion());
 			CONMSG("http://www.sourcemm.net/\n");
 
 			return true;
@@ -680,7 +680,7 @@ bool Command_ClientMeta(edict_t *client, IMetamodSourceCommandInfo *info)
 				CLIENT_CONMSG(client, "Metamod:Source version %s\n", SOURCEMM_VERSION);
 				CLIENT_CONMSG(client, "Compiled on: %s\n", SOURCEMM_DATE);
 				CLIENT_CONMSG(client, "Plugin interface version: %d:%d\n", PLAPI_VERSION, PLAPI_MIN_VERSION);
-				CLIENT_CONMSG(client, "SourceHook version: %d:%d\n", g_SourceHook.GetIfaceVersion(), g_SourceHook.GetImplVersion());
+				CLIENT_CONMSG(client, "SourceHook version: %d:%d\n", g_SHPtr->GetIfaceVersion(), g_SHPtr->GetImplVersion());
 				CLIENT_CONMSG(client, "http://www.sourcemm.net/\n");
 
 				return true;