From c4eeaaf2d1fe09919dc57bc40baa0f3ce176e63a Mon Sep 17 00:00:00 2001 From: David Anderson Date: Sun, 17 Feb 2008 23:40:37 +0000 Subject: [PATCH] builds on OB again --HG-- extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40649 --- sample_mm/Makefile | 2 +- sample_mm/engine_wrappers.h | 3 +++ sample_mm/sample_mm.cpp | 4 +++- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/sample_mm/Makefile b/sample_mm/Makefile index 81869f8..c2e0d92 100755 --- a/sample_mm/Makefile +++ b/sample_mm/Makefile @@ -35,7 +35,7 @@ ifeq "$(ENGINE)" "orangebox" HL2PUB = $(HL2SDK_OB)/public CFLAGS += -DENGINE_ORANGEBOX METAMOD = $(SOURCEMM16) - INCLUDE += -I$(HL2SDK)/game/server + INCLUDE += -I$(HL2SDK)/public/game/server SRCDS = $(SRCDS_BASE)/orangebox endif diff --git a/sample_mm/engine_wrappers.h b/sample_mm/engine_wrappers.h index 120509f..a911f63 100644 --- a/sample_mm/engine_wrappers.h +++ b/sample_mm/engine_wrappers.h @@ -58,12 +58,15 @@ public: } }; +#define CVAR_INTERFACE_VERSION VENGINE_CVAR_INTERFACE_VERSION #define ENGINE_CALL(func) SH_CALL(m_EngineCC, func) #elif defined ENGINE_ORANGEBOX #define ENGINE_CALL(func) SH_CALL(engine, func) +#define MM_Format g_SMAPI->Format #endif #endif //_INCLUDE_SOURCE_ENGINE_WRAPPERS_ + diff --git a/sample_mm/sample_mm.cpp b/sample_mm/sample_mm.cpp index 0916d1e..0ca544c 100644 --- a/sample_mm/sample_mm.cpp +++ b/sample_mm/sample_mm.cpp @@ -44,6 +44,7 @@ IServerPluginHelpers *helpers = NULL; IGameEventManager2 *gameevents = NULL; IServerPluginCallbacks *vsp_callbacks = NULL; IPlayerInfoManager *playerinfomanager = NULL; +ICvar *icvar = NULL; ConVar sample_cvar("sample_cvar", "42", 0); @@ -68,6 +69,7 @@ bool StubPlugin::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen, bo GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER); GET_V_IFACE_CURRENT(GetEngineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2); GET_V_IFACE_CURRENT(GetEngineFactory, helpers, IServerPluginHelpers, INTERFACEVERSION_ISERVERPLUGINHELPERS); + GET_V_IFACE_CURRENT(GetEngineFactory, icvar, ICvar, CVAR_INTERFACE_VERSION); GET_V_IFACE_ANY(GetServerFactory, server, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL); GET_V_IFACE_ANY(GetServerFactory, gameclients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS); GET_V_IFACE_ANY(GetServerFactory, playerinfomanager, IPlayerInfoManager, INTERFACEVERSION_PLAYERINFOMANAGER); @@ -102,7 +104,7 @@ bool StubPlugin::Load(PluginId id, ISmmAPI *ismm, char *error, size_t maxlen, bo ENGINE_CALL(&IVEngineServer::LogPrint)("All hooks started!\n"); #if defined ENGINE_ORANGEBOX - g_pCVar = ICvar; + g_pCVar = icvar; ConVar_Register(0, &s_BaseAccessor); #elif defined ENGINE_ORIGINAL ConCommandBaseMgr::OneTimeInit(&s_BaseAccessor);