]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
fix code for checking if player killed himself, also print a message to someone spawn...
authorFruitieX <fruitiex@gmail.com>
Tue, 16 Nov 2010 07:30:38 +0000 (09:30 +0200)
committerFruitieX <fruitiex@gmail.com>
Tue, 16 Nov 2010 07:30:38 +0000 (09:30 +0200)
qcsrc/server/mutators/gamemode_freezetag.qc

index 21602b4749b957575a6ff84a992e48e89f1b37b0..4f1d69eaa7ec9a213d872ebe4f7d2103fe421a22 100644 (file)
@@ -103,15 +103,15 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerDies)
        freezetag_Freeze();
 
        centerprint(frag_attacker, strcat("^2You froze ^7", frag_target.netname, ".\n"));
-       if(frag_target.netname != "")
+       if(frag_attacker == frag_target || frag_attacker == world)
        {
-               centerprint(frag_target, strcat("^1You were frozen by ^7", frag_attacker.netname, ".\n"));
-               bprint("^7", frag_target.netname, "^1 was frozen by ^7", frag_attacker.netname, ".\n");
+               centerprint(frag_target, strcat("^1You froze yourself.\n"));
+               bprint("^7", frag_target.netname, "^1 froze himself.\n");
        }
        else
        {
-               centerprint(frag_target, strcat("^1You froze yourself.\n"));
-               bprint("^7", frag_target.netname, "^1 froze himself.\n");
+               centerprint(frag_target, strcat("^1You were frozen by ^7", frag_attacker.netname, ".\n"));
+               bprint("^7", frag_target.netname, "^1 was frozen by ^7", frag_attacker.netname, ".\n");
        }
 
        frag_target.health = cvar("g_balance_health_start"); // "respawn" the player :P
@@ -128,6 +128,7 @@ MUTATOR_HOOKFUNCTION(freezetag_PlayerSpawn)
 
        if(time > warmup) // spawn too late, freeze player
        {
+               centerprint(self, strcat("^1You spawned after the round started, you'll spawn as frozen.\n"));
                freezetag_Freeze();
        }
        else // we are still in the delay period before the round starts