From 55d648d2f2c3933ffde1ab78115007cce989e493 Mon Sep 17 00:00:00 2001 From: terencehill Date: Thu, 8 Mar 2012 01:03:46 +0100 Subject: [PATCH] Freezetag: if you kill yourself don't centerprint the msg "You froze " too as the msg "You froze yourself" is enough --- qcsrc/server/mutators/gamemode_freezetag.qc | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/qcsrc/server/mutators/gamemode_freezetag.qc b/qcsrc/server/mutators/gamemode_freezetag.qc index 8ae9998cd..e29651470 100644 --- a/qcsrc/server/mutators/gamemode_freezetag.qc +++ b/qcsrc/server/mutators/gamemode_freezetag.qc @@ -166,22 +166,21 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDies) --pinkalive; --totalalive; - freezetag_Freeze(frag_attacker); + freezetag_Freeze(frag_attacker); } - if(frag_attacker.classname == STR_PLAYER) - centerprint(frag_attacker, strcat("^2You froze ^7", frag_target.netname, ".\n")); - if(frag_attacker == frag_target || frag_attacker == world) { - if(frag_target.classname == STR_PLAYER) - centerprint(frag_target, "^1You froze yourself.\n"); + if(frag_target.classname == STR_PLAYER) + centerprint(frag_target, "^1You froze yourself.\n"); bprint("^7", frag_target.netname, "^1 froze himself.\n"); } else { - if(frag_target.classname == STR_PLAYER) - centerprint(frag_target, strcat("^1You were frozen by ^7", frag_attacker.netname, ".\n")); + if(frag_target.classname == STR_PLAYER) + centerprint(frag_target, strcat("^1You were frozen by ^7", frag_attacker.netname, ".\n")); + if(frag_attacker.classname == STR_PLAYER) + centerprint(frag_attacker, strcat("^2You froze ^7", frag_target.netname, ".\n")); bprint("^7", frag_target.netname, "^1 was frozen by ^7", frag_attacker.netname, ".\n"); } @@ -194,7 +193,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDies) MUTATOR_HOOKFUNCTION(freezetag_PlayerSpawn) { - freezetag_Unfreeze(world); // start by making sure that all ice blocks are removed + freezetag_Unfreeze(world); // start by making sure that all ice blocks are removed if(total_players == 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 -- 2.39.2