1.1 --- a/cssdm_ffa.cpp Mon Sep 07 19:23:37 2009 -0700
1.2 +++ b/cssdm_ffa.cpp Fri Jun 25 00:33:30 2010 -0700
1.3 @@ -35,6 +35,8 @@
1.4 #define PLATFORM_NAME "Windows"
1.5 #elif defined PLATFORM_LINUX
1.6 #define PLATFORM_NAME "Linux"
1.7 +#elif defined __APPLE__
1.8 +#define PLATFORM_NAME "Mac"
1.9 #endif
1.10
1.11 bool g_FFA_Patched = false;
1.12 @@ -43,16 +45,22 @@
1.13 void **g_gamerules_addr = NULL;
1.14
1.15 /* Lagcomp */
1.16 -int g_lagcomp_offset = 0;
1.17 -void *g_lagcomp_addr = NULL;
1.18 -dmpatch_t g_lagcomp_patch;
1.19 -dmpatch_t g_lagcomp_restore;
1.20 +static int g_lagcomp_offset = 0;
1.21 +static void *g_lagcomp_addr = NULL;
1.22 +static dmpatch_t g_lagcomp_patch;
1.23 +static dmpatch_t g_lagcomp_restore;
1.24
1.25 /* Takedamage */
1.26 -int g_takedmg_offset[5] = {0};
1.27 -void *g_takedmg_addr = NULL;
1.28 -dmpatch_t g_takedmg_patch[2];
1.29 -dmpatch_t g_takedmg_restore[2];
1.30 +static int g_takedmg_offset[5] = {0};
1.31 +static void *g_takedmg_addr = NULL;
1.32 +static dmpatch_t g_takedmg_patch[2];
1.33 +static dmpatch_t g_takedmg_restore[2];
1.34 +
1.35 +/* Calc domination and revenge */
1.36 +static int g_domrev_offset = 0;
1.37 +static void *g_domrev_addr = NULL;
1.38 +static dmpatch_t g_domrev_patch;
1.39 +static dmpatch_t g_domrev_restore;
1.40
1.41 int OnIPointsForKill(CBasePlayer *pl1, CBasePlayer *pl2)
1.42 {
1.43 @@ -95,6 +103,11 @@
1.44 snprintf(error, maxlength, "Could not find \"WantsLagComp\" signature!");
1.45 return false;
1.46 }
1.47 + if (!g_pDmConf->GetMemSig("CalcDominationAndRevenge", &g_domrev_addr) || !g_domrev_addr)
1.48 + {
1.49 + snprintf(error, maxlength, "Could not find \"CalcDominationAndRevenge\" signature!");
1.50 + return false;
1.51 + }
1.52 if (!g_pDmConf->GetMemSig("CGameRules", &gamerules) || !gamerules)
1.53 {
1.54 snprintf(error, maxlength, "Could not find \"CGameRules\" signature!");
1.55 @@ -112,6 +125,17 @@
1.56 return false;
1.57 }
1.58
1.59 + if (!g_pDmConf->GetOffset("CalcDomRevPatch", &g_domrev_offset)
1.60 + || !g_domrev_offset)
1.61 + {
1.62 + snprintf(error, maxlength, "Could not find CalcDomRevPatch offset");
1.63 + return false;
1.64 + }
1.65 + if (!DM_FFA_LoadPatch("CalcDomRevPatch", &g_domrev_patch, error, maxlength))
1.66 + {
1.67 + return false;
1.68 + }
1.69 +
1.70 if (!g_pDmConf->GetOffset("TakeDmgPatch1", &g_takedmg_offset[0])
1.71 || !g_takedmg_offset[0])
1.72 {
1.73 @@ -168,6 +192,7 @@
1.74 DM_ApplyPatch(g_lagcomp_addr, g_lagcomp_offset, &g_lagcomp_patch, &g_lagcomp_restore);
1.75 DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[0], &g_takedmg_patch[0], &g_takedmg_restore[0]);
1.76 DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[1], &g_takedmg_patch[1], &g_takedmg_restore[1]);
1.77 + DM_ApplyPatch(g_domrev_addr, g_domrev_offset, &g_domrev_patch, &g_domrev_restore);
1.78
1.79 SH_ADD_MANUALHOOK_STATICFUNC(CGameRules_IPointsForKill, *g_gamerules_addr, OnIPointsForKill, false);
1.80
1.81 @@ -191,6 +216,7 @@
1.82 DM_ApplyPatch(g_lagcomp_addr, g_lagcomp_offset, &g_lagcomp_restore, NULL);
1.83 DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[0], &g_takedmg_restore[0], NULL);
1.84 DM_ApplyPatch(g_takedmg_addr, g_takedmg_offset[1], &g_takedmg_restore[1], NULL);
1.85 + DM_ApplyPatch(g_domrev_addr, g_domrev_offset, &g_domrev_restore, NULL);
1.86
1.87 g_FFA_Patched = false;
1.88