From ff37807891313ea185b159dba422c3c905a61ee8 Mon Sep 17 00:00:00 2001 From: Rudolf Polzer Date: Thu, 30 Dec 2010 21:18:52 +0100 Subject: [PATCH] fix errors --- qcsrc/server/cl_player.qc | 1 - qcsrc/server/mutators/gamemode_freezetag.qc | 13 ++++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/qcsrc/server/cl_player.qc b/qcsrc/server/cl_player.qc index 025dfc477..bac718356 100644 --- a/qcsrc/server/cl_player.qc +++ b/qcsrc/server/cl_player.qc @@ -387,7 +387,6 @@ void PlayerCorpseDamage (entity inflictor, entity attacker, float damage, float void ClientKill_Now_TeamChange(); void freezetag_CheckWinner(); -void freezetag_Unfreeze(); void PlayerDamage (entity inflictor, entity attacker, float damage, float deathtype, vector hitloc, vector force) { diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index 27b06ec73..c9885f201 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -111,8 +111,11 @@ void freezetag_Unfreeze(entity attacker) { self.freezetag_frozen = 0; - PlayerScore_Add(attacker, SP_FREEZETAG_REVIVAL, +1); - PlayerScore_Add(attacker, SP_SCORE, +1); + if(attacker) + { + PlayerScore_Add(attacker, SP_FREEZETAG_REVIVALS, +1); + PlayerScore_Add(attacker, SP_SCORE, +1); + } // remove the ice block entity ice; @@ -145,7 +148,7 @@ MUTATOR_HOOKFUNCTION(freezetag_RemovePlayer) if(totalspawned > 2) // only check for winners if we had more than two players (one of them left, don't let the other player win just because of that) freezetag_CheckWinner(); - freezetag_Unfreeze(); + freezetag_Unfreeze(world); return 1; } @@ -192,7 +195,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDies) MUTATOR_HOOKFUNCTION(freezetag_PlayerSpawn) { - freezetag_Unfreeze(); // start by making sure that all ice blocks are removed + freezetag_Unfreeze(world); // start by making sure that all ice blocks are removed if(totalspawned == 1 && time > game_starttime) // only one player active on server, start a new match immediately if(!next_round && warmup && (time < warmup - autocvar_g_freezetag_warmup || time > warmup)) // not awaiting next round @@ -246,7 +249,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerPreThink) self.freezetag_revive_progress = (time - self.freezetag_beginrevive_time) / autocvar_g_freezetag_revive_time; if(time - self.freezetag_beginrevive_time >= autocvar_g_freezetag_revive_time) { - freezetag_Unfreeze(); + freezetag_Unfreeze(self); centerprint(self, strcat("^5You were revived by ^7", other.netname, ".\n")); centerprint(other, strcat("^5You revived ^7", self.netname, ".\n")); -- 2.39.2