From eb812244d9fba85f6a117e7b5dc1ee500544a08a Mon Sep 17 00:00:00 2001 From: Magnus Auvinen Date: Wed, 24 Sep 2008 14:54:51 +0000 Subject: fixed server crash when dieing --- src/game/server/entities/character.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/game/server/entities/character.cpp') diff --git a/src/game/server/entities/character.cpp b/src/game/server/entities/character.cpp index e79962c2..c04be833 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -801,7 +801,7 @@ bool CHARACTER::take_damage(vec2 force, int dmg, int from, int weapon) if(health <= 0) { die(from, weapon); - + // set attacker's face to happy (taunt!) if (from >= 0 && from != player->client_id) { @@ -809,7 +809,7 @@ bool CHARACTER::take_damage(vec2 force, int dmg, int from, int weapon) chr->emote_type = EMOTE_HAPPY; chr->emote_stop = server_tick() + server_tickspeed(); } - + return false; } -- cgit 1.4.1