Initial import of Orange Box port and psychonic's gamedata.
authorDavid Anderson <dvander@alliedmods.net>
Fri Jun 25 00:33:30 2010 -0700 (2010-06-25)
changeset 47c53e1d3f3da0
parent 46 0c77e80749cf
child 48 237360d66ce0
Initial import of Orange Box port and psychonic's gamedata.
cssdm_config.cpp
cssdm_ctrl.cpp
cssdm_events.cpp
cssdm_events.h
cssdm_ffa.cpp
cssdm_headers.h
cssdm_main.cpp
cssdm_utils.cpp
cssdm_utils.h
msvc8/sm_cssdm.vcproj
sdk/smsdk_config.h
sdk/smsdk_ext.cpp
     1.1 --- a/cssdm_config.cpp	Mon Sep 07 19:23:37 2009 -0700
     1.2 +++ b/cssdm_config.cpp	Fri Jun 25 00:33:30 2010 -0700
     1.3 @@ -29,10 +29,11 @@
     1.4  #include "cssdm_ctrl.h"
     1.5  #include "cssdm_ffa.h"
     1.6  #include "cssdm_callbacks.h"
     1.7 +#include "cssdm_headers.h"
     1.8  
     1.9 -void ChangeStatus(ConVar *cvar, const char *value);
    1.10 -void ChangeFFAStatus(ConVar *cvar, const char *value);
    1.11 -void ChangeSpawnStatus(ConVar *cvar, const char *value);
    1.12 +static void ChangeStatus(IConVar *cvar, const char *value, float flOldValue);
    1.13 +static void ChangeFFAStatus(IConVar *cvar, const char *value, float flOldValue);
    1.14 +static void ChangeSpawnStatus(IConVar *cvar, const char *value, float flOldValue);
    1.15  
    1.16  ConVar cssdm_ragdoll_time("cssdm_ragdoll_time", "2", 0, "Sets ragdoll stay time", true, 0.0, true, 20.0);
    1.17  ConVar cssdm_respawn_wait("cssdm_respawn_wait", "0.75", 0, "Sets respawn wait time");
    1.18 @@ -69,10 +70,11 @@
    1.19  
    1.20  void SM_InitConCommandBase()
    1.21  {
    1.22 -	ConCommandBaseMgr::OneTimeInit(&s_LinkConVars);
    1.23 +	g_pCVar = icvar;
    1.24 +	ConVar_Register(0, &s_LinkConVars);
    1.25  }
    1.26  
    1.27 -void ChangeStatus(ConVar *cvar, const char *value)
    1.28 +static void ChangeStatus(IConVar *cvar, const char *value, float flOldValue)
    1.29  {
    1.30  	if (cssdm_enabled.GetInt())
    1.31  	{
    1.32 @@ -82,7 +84,7 @@
    1.33  	}
    1.34  }
    1.35  
    1.36 -void ChangeFFAStatus(ConVar *cvar, const char *value)
    1.37 +static void ChangeFFAStatus(IConVar *cvar, const char *value, float flOldValue)
    1.38  {
    1.39  	if (cssdm_ffa_enabled.GetInt() && !DM_FFA_IsPatched() && DM_FFA_IsPrepared())
    1.40  	{
    1.41 @@ -92,7 +94,7 @@
    1.42  	}
    1.43  }
    1.44  
    1.45 -void ChangeSpawnStatus(ConVar *cvar, const char *value)
    1.46 +static void ChangeSpawnStatus(IConVar *cvar, const char *value, float flOldValue)
    1.47  {
    1.48  	if (strcmp(value, cssdm_spawn_method.GetString()) == 0)
    1.49  	{
     2.1 --- a/cssdm_ctrl.cpp	Mon Sep 07 19:23:37 2009 -0700
     2.2 +++ b/cssdm_ctrl.cpp	Fri Jun 25 00:33:30 2010 -0700
     2.3 @@ -135,21 +135,21 @@
     2.4  
     2.5  CON_COMMAND(cssdm, "CS:S DM console menu")
     2.6  {
     2.7 -	int args = engine->Cmd_Argc();
     2.8 -	if (args < 2)
     2.9 +	int argc = args.ArgC();
    2.10 +	if (argc < 2)
    2.11  	{
    2.12  		/* :TODO: display menu */
    2.13  		return;
    2.14  	}
    2.15  
    2.16 -	const char *arg = engine->Cmd_Argv(1);
    2.17 +	const char *arg = args.Arg(1);
    2.18  	if (strcmp(arg, "internal") == 0)
    2.19  	{
    2.20 -		if (args < 3)
    2.21 +		if (argc < 3)
    2.22  		{
    2.23  			return;
    2.24  		}
    2.25 -		int num = atoi(engine->Cmd_Argv(2));
    2.26 +		int num = atoi(args.Arg(2));
    2.27  		if (num == 1)
    2.28  		{
    2.29  			DM_StartEverything();
     3.1 --- a/cssdm_events.cpp	Mon Sep 07 19:23:37 2009 -0700
     3.2 +++ b/cssdm_events.cpp	Fri Jun 25 00:33:30 2010 -0700
     3.3 @@ -147,14 +147,14 @@
     3.4  	player->respawn_timer = timersys->CreateTimer(&s_PlayerSpawner, DM_GetRespawnWait(), pack, 0);
     3.5  }
     3.6  
     3.7 -void OnClientCommand_Post(edict_t *edict)
     3.8 +void OnClientCommand_Post(edict_t *edict, const CCommand &args)
     3.9  {
    3.10  	if (!g_IsRunning)
    3.11  	{
    3.12  		return;
    3.13  	}
    3.14  
    3.15 -	const char *cmd = engine->Cmd_Argv(0);
    3.16 +	const char *cmd = args.Arg(0);
    3.17  
    3.18  	if (strcmp(cmd, "joinclass") == 0)
    3.19  	{
     4.1 --- a/cssdm_events.h	Mon Sep 07 19:23:37 2009 -0700
     4.2 +++ b/cssdm_events.h	Fri Jun 25 00:33:30 2010 -0700
     4.3 @@ -47,8 +47,10 @@
     4.4  DECLARE_EVENT(round_end);
     4.5  DECLARE_EVENT(item_pickup);
     4.6  
     4.7 +class CCommand;
     4.8 +
     4.9  void DM_ClearRagdollTimers();
    4.10 -void OnClientCommand_Post(edict_t *edict);
    4.11 +void OnClientCommand_Post(edict_t *edict, const CCommand &args);
    4.12  void OnClientDropWeapons(CBaseEntity *pEntity);
    4.13  void OnClientDroppedWeapon(CBaseEntity *pEntity, CBaseEntity *pWeapon);
    4.14  
     5.1 --- a/cssdm_ffa.cpp	Mon Sep 07 19:23:37 2009 -0700
     5.2 +++ b/cssdm_ffa.cpp	Fri Jun 25 00:33:30 2010 -0700
     5.3 @@ -35,6 +35,8 @@
     5.4  #define PLATFORM_NAME	"Windows"
     5.5  #elif defined PLATFORM_LINUX
     5.6  #define PLATFORM_NAME	"Linux"
     5.7 +#elif defined __APPLE__
     5.8 +#define PLATFORM_NAME	"Mac"
     5.9  #endif
    5.10  
    5.11  bool g_FFA_Patched = false;
    5.12 @@ -43,16 +45,22 @@
    5.13  void **g_gamerules_addr = NULL;
    5.14  
    5.15  /* Lagcomp */
    5.16 -int g_lagcomp_offset = 0;
    5.17 -void *g_lagcomp_addr = NULL;
    5.18 -dmpatch_t g_lagcomp_patch;
    5.19 -dmpatch_t g_lagcomp_restore;
    5.20 +static int g_lagcomp_offset = 0;
    5.21 +static void *g_lagcomp_addr = NULL;
    5.22 +static dmpatch_t g_lagcomp_patch;
    5.23 +static dmpatch_t g_lagcomp_restore;
    5.24  
    5.25  /* Takedamage */
    5.26 -int g_takedmg_offset[5] = {0};
    5.27 -void *g_takedmg_addr = NULL;
    5.28 -dmpatch_t g_takedmg_patch[2];
    5.29 -dmpatch_t g_takedmg_restore[2];
    5.30 +static int g_takedmg_offset[5] = {0};
    5.31 +static void *g_takedmg_addr = NULL;
    5.32 +static dmpatch_t g_takedmg_patch[2];
    5.33 +static dmpatch_t g_takedmg_restore[2];
    5.34 +
    5.35 +/* Calc domination and revenge */
    5.36 +static int g_domrev_offset = 0;
    5.37 +static void *g_domrev_addr = NULL;
    5.38 +static dmpatch_t g_domrev_patch;
    5.39 +static dmpatch_t g_domrev_restore;
    5.40  
    5.41  int OnIPointsForKill(CBasePlayer *pl1, CBasePlayer *pl2)
    5.42  {
    5.43 @@ -95,6 +103,11 @@
    5.44  		snprintf(error, maxlength, "Could not find \"WantsLagComp\" signature!");
    5.45  		return false;
    5.46  	}
    5.47 +	if (!g_pDmConf->GetMemSig("CalcDominationAndRevenge", &g_domrev_addr) || !g_domrev_addr)
    5.48 +	{
    5.49 +		snprintf(error, maxlength, "Could not find \"CalcDominationAndRevenge\" signature!");
    5.50 +		return false;
    5.51 +	}
    5.52  	if (!g_pDmConf->GetMemSig("CGameRules", &gamerules) || !gamerules)
    5.53  	{
    5.54  		snprintf(error, maxlength, "Could not find \"CGameRules\" signature!");
    5.55 @@ -112,6 +125,17 @@
    5.56  		return false;
    5.57  	}
    5.58  
    5.59 +	if (!g_pDmConf->GetOffset("CalcDomRevPatch", &g_domrev_offset)
    5.60 +		|| !g_domrev_offset)
    5.61 +	{
    5.62 +		snprintf(error, maxlength, "Could not find CalcDomRevPatch offset");
    5.63 +		return false;
    5.64 +	}
    5.65 +	if (!DM_FFA_LoadPatch("CalcDomRevPatch", &g_domrev_patch, error, maxlength))
    5.66 +	{
    5.67 +		return false;
    5.68 +	}
    5.69 +
    5.70  	if (!g_pDmConf->GetOffset("TakeDmgPatch1", &g_takedmg_offset[0])
    5.71  		|| !g_takedmg_offset[0])
    5.72  	{
    5.73 @@ -168,6 +192,7 @@
    5.74  	DM_ApplyPatch(g_lagcomp_addr, g_lagcomp_offset, &g_lagcomp_patch, &g_lagcomp_restore);
    5.75  	DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[0], &g_takedmg_patch[0], &g_takedmg_restore[0]);
    5.76  	DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[1], &g_takedmg_patch[1], &g_takedmg_restore[1]);
    5.77 +	DM_ApplyPatch(g_domrev_addr, g_domrev_offset, &g_domrev_patch, &g_domrev_restore);
    5.78  
    5.79  	SH_ADD_MANUALHOOK_STATICFUNC(CGameRules_IPointsForKill, *g_gamerules_addr, OnIPointsForKill, false);
    5.80  
    5.81 @@ -191,6 +216,7 @@
    5.82  	DM_ApplyPatch(g_lagcomp_addr, g_lagcomp_offset, &g_lagcomp_restore, NULL);
    5.83  	DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[0], &g_takedmg_restore[0], NULL);
    5.84  	DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[1], &g_takedmg_restore[1], NULL);
    5.85 +	DM_ApplyPatch(g_domrev_addr, g_domrev_offset, &g_domrev_restore, NULL);
    5.86  
    5.87  	g_FFA_Patched = false;
    5.88  
     6.1 --- a/cssdm_headers.h	Mon Sep 07 19:23:37 2009 -0700
     6.2 +++ b/cssdm_headers.h	Fri Jun 25 00:33:30 2010 -0700
     6.3 @@ -44,5 +44,6 @@
     6.4  extern bool g_IsRunning;
     6.5  extern bool g_IsInGlobalShutdown;
     6.6  extern ISourcePawnEngine *spengine;
     6.7 +extern ICvar *icvar;
     6.8  
     6.9  #endif //_INCLUDE_CSSDM_HEADERS_H_
     7.1 --- a/cssdm_main.cpp	Mon Sep 07 19:23:37 2009 -0700
     7.2 +++ b/cssdm_main.cpp	Fri Jun 25 00:33:30 2010 -0700
     7.3 @@ -40,7 +40,7 @@
     7.4  SH_DECL_HOOK3_void(IServerGameDLL, ServerActivate, SH_NOATTRIB, 0, edict_t *, int, int);
     7.5  SH_DECL_HOOK0_void(IServerGameDLL, LevelShutdown, SH_NOATTRIB, 0)
     7.6  SH_DECL_HOOK0_void(IServerGameDLL, DLLShutdown, SH_NOATTRIB, false);
     7.7 -SH_DECL_HOOK1_void(IServerGameClients, ClientCommand, SH_NOATTRIB, false, edict_t *);
     7.8 +SH_DECL_HOOK2_void(IServerGameClients, ClientCommand, SH_NOATTRIB, false, edict_t *, const CCommand &);
     7.9  
    7.10  Deathmatch g_DM;
    7.11  IGameEventManager2 *gameevents = NULL;
    7.12 @@ -106,7 +106,7 @@
    7.13  		return false;
    7.14  	}
    7.15  
    7.16 -	gpGlobals = g_SMAPI->pGlobals();
    7.17 +	gpGlobals = g_SMAPI->GetCGlobals();
    7.18  
    7.19  	SM_InitConCommandBase();
    7.20  
    7.21 @@ -117,12 +117,12 @@
    7.22  
    7.23  bool Deathmatch::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool late)
    7.24  {
    7.25 -	GET_V_IFACE_CURRENT(engineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2);
    7.26 -	GET_V_IFACE_CURRENT(fileSystemFactory, basefilesystem, IBaseFileSystem, BASEFILESYSTEM_INTERFACE_VERSION);
    7.27 -	GET_V_IFACE_ANY(serverFactory, playerinfomngr, IPlayerInfoManager, INTERFACEVERSION_PLAYERINFOMANAGER);
    7.28 -	GET_V_IFACE_ANY(serverFactory, gameents,IServerGameEnts, INTERFACEVERSION_SERVERGAMEENTS);
    7.29 -	GET_V_IFACE_ANY(serverFactory, botmanager, IBotManager, INTERFACEVERSION_PLAYERBOTMANAGER);
    7.30 -	GET_V_IFACE_ANY(serverFactory, gameclients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS);
    7.31 +	GET_V_IFACE_CURRENT(GetEngineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2);
    7.32 +	GET_V_IFACE_CURRENT(GetFileSystemFactory, basefilesystem, IBaseFileSystem, BASEFILESYSTEM_INTERFACE_VERSION);
    7.33 +	GET_V_IFACE_ANY(GetServerFactory, playerinfomngr, IPlayerInfoManager, INTERFACEVERSION_PLAYERINFOMANAGER);
    7.34 +	GET_V_IFACE_ANY(GetServerFactory, gameents,IServerGameEnts, INTERFACEVERSION_SERVERGAMEENTS);
    7.35 +	GET_V_IFACE_ANY(GetServerFactory, botmanager, IBotManager, INTERFACEVERSION_PLAYERBOTMANAGER);
    7.36 +	GET_V_IFACE_ANY(GetServerFactory, gameclients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS);
    7.37  
    7.38  	return true;
    7.39  }
     8.1 --- a/cssdm_utils.cpp	Mon Sep 07 19:23:37 2009 -0700
     8.2 +++ b/cssdm_utils.cpp	Fri Jun 25 00:33:30 2010 -0700
     8.3 @@ -30,7 +30,7 @@
     8.4  #include "cssdm_includesdk.h"
     8.5  #include <sh_list.h>
     8.6  
     8.7 -#if defined PLATFORM_LINUX
     8.8 +#if defined PLATFORM_POSIX
     8.9  #include <sys/mman.h>
    8.10  #define	PAGE_SIZE	4096
    8.11  #define ALIGN(ar) ((long)ar & ~(PAGE_SIZE-1))
    8.12 @@ -301,7 +301,7 @@
    8.13  {
    8.14  	void *addr;
    8.15  	int offset;
    8.16 -	PassInfo pass[4];
    8.17 +	SourceMod::PassInfo pass[4];
    8.18  
    8.19  	/** ROUNDRESPAWN */
    8.20  	g_pDmConf->GetMemSig("RoundRespawn", &addr);
     9.1 --- a/cssdm_utils.h	Mon Sep 07 19:23:37 2009 -0700
     9.2 +++ b/cssdm_utils.h	Fri Jun 25 00:33:30 2010 -0700
     9.3 @@ -29,7 +29,7 @@
     9.4  
     9.5  #include "smsdk_ext.h"
     9.6  
     9.7 -#if defined PLATFORM_LINUX
     9.8 +#if defined PLATFORM_POSIX
     9.9  #define EXTRA_VTBL_OFFSET	1
    9.10  #elif defined PLATFORM_WINDOWS
    9.11  #define EXTRA_VTBL_OFFSET	0
    10.1 --- a/msvc8/sm_cssdm.vcproj	Mon Sep 07 19:23:37 2009 -0700
    10.2 +++ b/msvc8/sm_cssdm.vcproj	Fri Jun 25 00:33:30 2010 -0700
    10.3 @@ -40,7 +40,7 @@
    10.4  			<Tool
    10.5  				Name="VCCLCompilerTool"
    10.6  				Optimization="0"
    10.7 -				AdditionalIncludeDirectories="..\sdk;$(SOURCEMOD)\public;$(SOURCEMOD)\public\extensions;$(SOURCEMOD)\public\sourcepawn;$(HL2SDK)\game_shared;$(HL2SDK)\dlls;$(HL2SDK)\public;$(HL2SDK)\public\dlls;$(HL2SDK)\public\engine;$(HL2SDK)\public\tier0;$(HL2SDK)\public\tier1;$(HL2SDK)\public\vstdlib;$(HL2SDK)\tier1;$(SOURCEMM142);$(SOURCEMM142)\sourcemm;$(SOURCEMM142)\sourcehook"
    10.8 +				AdditionalIncludeDirectories="..\sdk;&quot;$(SOURCEMOD)\public&quot;;&quot;$(SOURCEMOD)\public\extensions&quot;;&quot;$(SOURCEMOD)\public\sourcepawn&quot;;&quot;$(HL2SDKOBVALVE)\game\shared&quot;;&quot;$(HL2SDKOBVALVE)\public\game\server&quot;;&quot;$(HL2SDKOBVALVE)\game\server&quot;;&quot;$(HL2SDKOBVALVE)\public&quot;;&quot;$(HL2SDKOBVALVE)\public\engine&quot;;&quot;$(HL2SDKOBVALVE)\public\tier0&quot;;&quot;$(HL2SDKOBVALVE)\public\tier1&quot;;&quot;$(HL2SDKOBVALVE)\public\vstdlib&quot;;&quot;$(HL2SDKOBVALVE)\tier1&quot;;&quot;$(MMSOURCE18)&quot;;&quot;$(MMSOURCE18)\core&quot;;&quot;$(MMSOURCE18)\core\sourcehook&quot;"
    10.9  				PreprocessorDefinitions="WIN32;_DEBUG;_WINDOWS;_USRDLL;SDK_EXPORTS;_CRT_SECURE_NO_DEPRECATE;SOURCEMOD_BUILD"
   10.10  				MinimalRebuild="true"
   10.11  				BasicRuntimeChecks="3"
   10.12 @@ -62,7 +62,7 @@
   10.13  			/>
   10.14  			<Tool
   10.15  				Name="VCLinkerTool"
   10.16 -				AdditionalDependencies="$(HL2SDK)\lib\public\tier1.lib $(HL2SDK)\lib\public\vstdlib.lib $(HL2SDK)\lib\public\tier0.lib"
   10.17 +				AdditionalDependencies="$(HL2SDKOBVALVE)\lib\public\tier1.lib $(HL2SDKOBVALVE)\lib\public\vstdlib.lib $(HL2SDKOBVALVE)\lib\public\tier0.lib"
   10.18  				OutputFile="$(OutDir)\cssdm.ext.dll"
   10.19  				LinkIncremental="2"
   10.20  				IgnoreDefaultLibraryNames="LIBCMT"
    11.1 --- a/sdk/smsdk_config.h	Mon Sep 07 19:23:37 2009 -0700
    11.2 +++ b/sdk/smsdk_config.h	Fri Jun 25 00:33:30 2010 -0700
    11.3 @@ -27,7 +27,7 @@
    11.4  /* Basic information exposed publicly */
    11.5  #define SMEXT_CONF_NAME			"CS:S DM"
    11.6  #define SMEXT_CONF_DESCRIPTION	"Deathmatch for CS:S"
    11.7 -#define SMEXT_CONF_VERSION		"2.1.0.446"
    11.8 +#define SMEXT_CONF_VERSION		"2.1.1"
    11.9  #define SMEXT_CONF_AUTHOR		"AlliedModders"
   11.10  #define SMEXT_CONF_URL			"http://www.bailopan.net/cssdm/"
   11.11  #define SMEXT_CONF_LOGTAG		"CSSDM"
    12.1 --- a/sdk/smsdk_ext.cpp	Mon Sep 07 19:23:37 2009 -0700
    12.2 +++ b/sdk/smsdk_ext.cpp	Fri Jun 25 00:33:30 2010 -0700
    12.3 @@ -17,7 +17,7 @@
    12.4   */
    12.5  
    12.6  #include <stdio.h>
    12.7 -#include <malloc.h>
    12.8 +#include <stdlib.h>
    12.9  #include "smsdk_ext.h"
   12.10  
   12.11  /**
   12.12 @@ -221,11 +221,12 @@
   12.13  
   12.14  IVEngineServer *engine = NULL;				/**< IVEngineServer pointer */
   12.15  IServerGameDLL *gamedll = NULL;				/**< IServerGameDLL pointer */
   12.16 +ICvar *icvar = NULL;
   12.17  
   12.18  /** Exposes the extension to Metamod */
   12.19  SMM_API void *PL_EXPOSURE(const char *name, int *code)
   12.20  {
   12.21 -	if (name && !strcmp(name, PLAPI_NAME))
   12.22 +	if (name && !strcmp(name, METAMOD_PLAPI_NAME))
   12.23  	{
   12.24  		if (code)
   12.25  		{
   12.26 @@ -246,8 +247,8 @@
   12.27  {
   12.28  	PLUGIN_SAVEVARS();
   12.29  
   12.30 -	GET_V_IFACE_ANY(serverFactory, gamedll, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL);
   12.31 -	GET_V_IFACE_CURRENT(engineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER);
   12.32 +	GET_V_IFACE_ANY(GetServerFactory, gamedll, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL);
   12.33 +	GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER);
   12.34  
   12.35  	m_SourceMMLoaded = true;
   12.36