diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-24 14:54:51 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-09-24 14:54:51 +0000 |
| commit | eb812244d9fba85f6a117e7b5dc1ee500544a08a (patch) | |
| tree | e32f5de3b2cc0f288a5a0c21b5a4dd012aa20235 /src/game/server/entities/character.cpp | |
| parent | 917ebc17c617dfd27e4e997dce713cb1dfb6cfdc (diff) | |
| download | zcatch-eb812244d9fba85f6a117e7b5dc1ee500544a08a.tar.gz zcatch-eb812244d9fba85f6a117e7b5dc1ee500544a08a.zip | |
fixed server crash when dieing
Diffstat (limited to 'src/game/server/entities/character.cpp')
| -rw-r--r-- | src/game/server/entities/character.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
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; } |