# HG changeset patch # User David Anderson # Date 1277451210 25200 # Node ID c53e1d3f3da0ea75b20c7036a6db7bec71c1d771 # Parent 0c77e80749cf272782156f7b636b417bca1c9c7f Initial import of Orange Box port and psychonic's gamedata. diff -r 0c77e80749cf -r c53e1d3f3da0 cssdm_config.cpp --- a/cssdm_config.cpp Mon Sep 07 19:23:37 2009 -0700 +++ b/cssdm_config.cpp Fri Jun 25 00:33:30 2010 -0700 @@ -29,10 +29,11 @@ #include "cssdm_ctrl.h" #include "cssdm_ffa.h" #include "cssdm_callbacks.h" +#include "cssdm_headers.h" -void ChangeStatus(ConVar *cvar, const char *value); -void ChangeFFAStatus(ConVar *cvar, const char *value); -void ChangeSpawnStatus(ConVar *cvar, const char *value); +static void ChangeStatus(IConVar *cvar, const char *value, float flOldValue); +static void ChangeFFAStatus(IConVar *cvar, const char *value, float flOldValue); +static void ChangeSpawnStatus(IConVar *cvar, const char *value, float flOldValue); ConVar cssdm_ragdoll_time("cssdm_ragdoll_time", "2", 0, "Sets ragdoll stay time", true, 0.0, true, 20.0); ConVar cssdm_respawn_wait("cssdm_respawn_wait", "0.75", 0, "Sets respawn wait time"); @@ -69,10 +70,11 @@ void SM_InitConCommandBase() { - ConCommandBaseMgr::OneTimeInit(&s_LinkConVars); + g_pCVar = icvar; + ConVar_Register(0, &s_LinkConVars); } -void ChangeStatus(ConVar *cvar, const char *value) +static void ChangeStatus(IConVar *cvar, const char *value, float flOldValue) { if (cssdm_enabled.GetInt()) { @@ -82,7 +84,7 @@ } } -void ChangeFFAStatus(ConVar *cvar, const char *value) +static void ChangeFFAStatus(IConVar *cvar, const char *value, float flOldValue) { if (cssdm_ffa_enabled.GetInt() && !DM_FFA_IsPatched() && DM_FFA_IsPrepared()) { @@ -92,7 +94,7 @@ } } -void ChangeSpawnStatus(ConVar *cvar, const char *value) +static void ChangeSpawnStatus(IConVar *cvar, const char *value, float flOldValue) { if (strcmp(value, cssdm_spawn_method.GetString()) == 0) { diff -r 0c77e80749cf -r c53e1d3f3da0 cssdm_ctrl.cpp --- a/cssdm_ctrl.cpp Mon Sep 07 19:23:37 2009 -0700 +++ b/cssdm_ctrl.cpp Fri Jun 25 00:33:30 2010 -0700 @@ -135,21 +135,21 @@ CON_COMMAND(cssdm, "CS:S DM console menu") { - int args = engine->Cmd_Argc(); - if (args < 2) + int argc = args.ArgC(); + if (argc < 2) { /* :TODO: display menu */ return; } - const char *arg = engine->Cmd_Argv(1); + const char *arg = args.Arg(1); if (strcmp(arg, "internal") == 0) { - if (args < 3) + if (argc < 3) { return; } - int num = atoi(engine->Cmd_Argv(2)); + int num = atoi(args.Arg(2)); if (num == 1) { DM_StartEverything(); diff -r 0c77e80749cf -r c53e1d3f3da0 cssdm_events.cpp --- a/cssdm_events.cpp Mon Sep 07 19:23:37 2009 -0700 +++ b/cssdm_events.cpp Fri Jun 25 00:33:30 2010 -0700 @@ -147,14 +147,14 @@ player->respawn_timer = timersys->CreateTimer(&s_PlayerSpawner, DM_GetRespawnWait(), pack, 0); } -void OnClientCommand_Post(edict_t *edict) +void OnClientCommand_Post(edict_t *edict, const CCommand &args) { if (!g_IsRunning) { return; } - const char *cmd = engine->Cmd_Argv(0); + const char *cmd = args.Arg(0); if (strcmp(cmd, "joinclass") == 0) { diff -r 0c77e80749cf -r c53e1d3f3da0 cssdm_events.h --- a/cssdm_events.h Mon Sep 07 19:23:37 2009 -0700 +++ b/cssdm_events.h Fri Jun 25 00:33:30 2010 -0700 @@ -47,8 +47,10 @@ DECLARE_EVENT(round_end); DECLARE_EVENT(item_pickup); +class CCommand; + void DM_ClearRagdollTimers(); -void OnClientCommand_Post(edict_t *edict); +void OnClientCommand_Post(edict_t *edict, const CCommand &args); void OnClientDropWeapons(CBaseEntity *pEntity); void OnClientDroppedWeapon(CBaseEntity *pEntity, CBaseEntity *pWeapon); diff -r 0c77e80749cf -r c53e1d3f3da0 cssdm_ffa.cpp --- a/cssdm_ffa.cpp Mon Sep 07 19:23:37 2009 -0700 +++ b/cssdm_ffa.cpp Fri Jun 25 00:33:30 2010 -0700 @@ -35,6 +35,8 @@ #define PLATFORM_NAME "Windows" #elif defined PLATFORM_LINUX #define PLATFORM_NAME "Linux" +#elif defined __APPLE__ +#define PLATFORM_NAME "Mac" #endif bool g_FFA_Patched = false; @@ -43,16 +45,22 @@ void **g_gamerules_addr = NULL; /* Lagcomp */ -int g_lagcomp_offset = 0; -void *g_lagcomp_addr = NULL; -dmpatch_t g_lagcomp_patch; -dmpatch_t g_lagcomp_restore; +static int g_lagcomp_offset = 0; +static void *g_lagcomp_addr = NULL; +static dmpatch_t g_lagcomp_patch; +static dmpatch_t g_lagcomp_restore; /* Takedamage */ -int g_takedmg_offset[5] = {0}; -void *g_takedmg_addr = NULL; -dmpatch_t g_takedmg_patch[2]; -dmpatch_t g_takedmg_restore[2]; +static int g_takedmg_offset[5] = {0}; +static void *g_takedmg_addr = NULL; +static dmpatch_t g_takedmg_patch[2]; +static dmpatch_t g_takedmg_restore[2]; + +/* Calc domination and revenge */ +static int g_domrev_offset = 0; +static void *g_domrev_addr = NULL; +static dmpatch_t g_domrev_patch; +static dmpatch_t g_domrev_restore; int OnIPointsForKill(CBasePlayer *pl1, CBasePlayer *pl2) { @@ -95,6 +103,11 @@ snprintf(error, maxlength, "Could not find \"WantsLagComp\" signature!"); return false; } + if (!g_pDmConf->GetMemSig("CalcDominationAndRevenge", &g_domrev_addr) || !g_domrev_addr) + { + snprintf(error, maxlength, "Could not find \"CalcDominationAndRevenge\" signature!"); + return false; + } if (!g_pDmConf->GetMemSig("CGameRules", &gamerules) || !gamerules) { snprintf(error, maxlength, "Could not find \"CGameRules\" signature!"); @@ -112,6 +125,17 @@ return false; } + if (!g_pDmConf->GetOffset("CalcDomRevPatch", &g_domrev_offset) + || !g_domrev_offset) + { + snprintf(error, maxlength, "Could not find CalcDomRevPatch offset"); + return false; + } + if (!DM_FFA_LoadPatch("CalcDomRevPatch", &g_domrev_patch, error, maxlength)) + { + return false; + } + if (!g_pDmConf->GetOffset("TakeDmgPatch1", &g_takedmg_offset[0]) || !g_takedmg_offset[0]) { @@ -168,6 +192,7 @@ DM_ApplyPatch(g_lagcomp_addr, g_lagcomp_offset, &g_lagcomp_patch, &g_lagcomp_restore); DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[0], &g_takedmg_patch[0], &g_takedmg_restore[0]); DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[1], &g_takedmg_patch[1], &g_takedmg_restore[1]); + DM_ApplyPatch(g_domrev_addr, g_domrev_offset, &g_domrev_patch, &g_domrev_restore); SH_ADD_MANUALHOOK_STATICFUNC(CGameRules_IPointsForKill, *g_gamerules_addr, OnIPointsForKill, false); @@ -191,6 +216,7 @@ DM_ApplyPatch(g_lagcomp_addr, g_lagcomp_offset, &g_lagcomp_restore, NULL); DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[0], &g_takedmg_restore[0], NULL); DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[1], &g_takedmg_restore[1], NULL); + DM_ApplyPatch(g_domrev_addr, g_domrev_offset, &g_domrev_restore, NULL); g_FFA_Patched = false; diff -r 0c77e80749cf -r c53e1d3f3da0 cssdm_headers.h --- a/cssdm_headers.h Mon Sep 07 19:23:37 2009 -0700 +++ b/cssdm_headers.h Fri Jun 25 00:33:30 2010 -0700 @@ -44,5 +44,6 @@ extern bool g_IsRunning; extern bool g_IsInGlobalShutdown; extern ISourcePawnEngine *spengine; +extern ICvar *icvar; #endif //_INCLUDE_CSSDM_HEADERS_H_ diff -r 0c77e80749cf -r c53e1d3f3da0 cssdm_main.cpp --- a/cssdm_main.cpp Mon Sep 07 19:23:37 2009 -0700 +++ b/cssdm_main.cpp Fri Jun 25 00:33:30 2010 -0700 @@ -40,7 +40,7 @@ SH_DECL_HOOK3_void(IServerGameDLL, ServerActivate, SH_NOATTRIB, 0, edict_t *, int, int); SH_DECL_HOOK0_void(IServerGameDLL, LevelShutdown, SH_NOATTRIB, 0) SH_DECL_HOOK0_void(IServerGameDLL, DLLShutdown, SH_NOATTRIB, false); -SH_DECL_HOOK1_void(IServerGameClients, ClientCommand, SH_NOATTRIB, false, edict_t *); +SH_DECL_HOOK2_void(IServerGameClients, ClientCommand, SH_NOATTRIB, false, edict_t *, const CCommand &); Deathmatch g_DM; IGameEventManager2 *gameevents = NULL; @@ -106,7 +106,7 @@ return false; } - gpGlobals = g_SMAPI->pGlobals(); + gpGlobals = g_SMAPI->GetCGlobals(); SM_InitConCommandBase(); @@ -117,12 +117,12 @@ bool Deathmatch::SDK_OnMetamodLoad(ISmmAPI *ismm, char *error, size_t maxlen, bool late) { - GET_V_IFACE_CURRENT(engineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2); - GET_V_IFACE_CURRENT(fileSystemFactory, basefilesystem, IBaseFileSystem, BASEFILESYSTEM_INTERFACE_VERSION); - GET_V_IFACE_ANY(serverFactory, playerinfomngr, IPlayerInfoManager, INTERFACEVERSION_PLAYERINFOMANAGER); - GET_V_IFACE_ANY(serverFactory, gameents,IServerGameEnts, INTERFACEVERSION_SERVERGAMEENTS); - GET_V_IFACE_ANY(serverFactory, botmanager, IBotManager, INTERFACEVERSION_PLAYERBOTMANAGER); - GET_V_IFACE_ANY(serverFactory, gameclients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS); + GET_V_IFACE_CURRENT(GetEngineFactory, gameevents, IGameEventManager2, INTERFACEVERSION_GAMEEVENTSMANAGER2); + GET_V_IFACE_CURRENT(GetFileSystemFactory, basefilesystem, IBaseFileSystem, BASEFILESYSTEM_INTERFACE_VERSION); + GET_V_IFACE_ANY(GetServerFactory, playerinfomngr, IPlayerInfoManager, INTERFACEVERSION_PLAYERINFOMANAGER); + GET_V_IFACE_ANY(GetServerFactory, gameents,IServerGameEnts, INTERFACEVERSION_SERVERGAMEENTS); + GET_V_IFACE_ANY(GetServerFactory, botmanager, IBotManager, INTERFACEVERSION_PLAYERBOTMANAGER); + GET_V_IFACE_ANY(GetServerFactory, gameclients, IServerGameClients, INTERFACEVERSION_SERVERGAMECLIENTS); return true; } diff -r 0c77e80749cf -r c53e1d3f3da0 cssdm_utils.cpp --- a/cssdm_utils.cpp Mon Sep 07 19:23:37 2009 -0700 +++ b/cssdm_utils.cpp Fri Jun 25 00:33:30 2010 -0700 @@ -30,7 +30,7 @@ #include "cssdm_includesdk.h" #include -#if defined PLATFORM_LINUX +#if defined PLATFORM_POSIX #include #define PAGE_SIZE 4096 #define ALIGN(ar) ((long)ar & ~(PAGE_SIZE-1)) @@ -301,7 +301,7 @@ { void *addr; int offset; - PassInfo pass[4]; + SourceMod::PassInfo pass[4]; /** ROUNDRESPAWN */ g_pDmConf->GetMemSig("RoundRespawn", &addr); diff -r 0c77e80749cf -r c53e1d3f3da0 cssdm_utils.h --- a/cssdm_utils.h Mon Sep 07 19:23:37 2009 -0700 +++ b/cssdm_utils.h Fri Jun 25 00:33:30 2010 -0700 @@ -29,7 +29,7 @@ #include "smsdk_ext.h" -#if defined PLATFORM_LINUX +#if defined PLATFORM_POSIX #define EXTRA_VTBL_OFFSET 1 #elif defined PLATFORM_WINDOWS #define EXTRA_VTBL_OFFSET 0 diff -r 0c77e80749cf -r c53e1d3f3da0 msvc8/sm_cssdm.vcproj --- a/msvc8/sm_cssdm.vcproj Mon Sep 07 19:23:37 2009 -0700 +++ b/msvc8/sm_cssdm.vcproj Fri Jun 25 00:33:30 2010 -0700 @@ -40,7 +40,7 @@ -#include +#include #include "smsdk_ext.h" /** @@ -221,11 +221,12 @@ IVEngineServer *engine = NULL; /**< IVEngineServer pointer */ IServerGameDLL *gamedll = NULL; /**< IServerGameDLL pointer */ +ICvar *icvar = NULL; /** Exposes the extension to Metamod */ SMM_API void *PL_EXPOSURE(const char *name, int *code) { - if (name && !strcmp(name, PLAPI_NAME)) + if (name && !strcmp(name, METAMOD_PLAPI_NAME)) { if (code) { @@ -246,8 +247,8 @@ { PLUGIN_SAVEVARS(); - GET_V_IFACE_ANY(serverFactory, gamedll, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL); - GET_V_IFACE_CURRENT(engineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER); + GET_V_IFACE_ANY(GetServerFactory, gamedll, IServerGameDLL, INTERFACEVERSION_SERVERGAMEDLL); + GET_V_IFACE_CURRENT(GetEngineFactory, engine, IVEngineServer, INTERFACEVERSION_VENGINESERVER); m_SourceMMLoaded = true;