diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-18 21:19:49 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-10-18 21:19:49 +0000 |
| commit | c561c365d70c73b3842709f76a3cafaa553dead0 (patch) | |
| tree | 0a8e83d15a8d454afdda24ca6aaedef2bae4797f /src/game/server/entities | |
| parent | c995aff8e3e7f756eab2740b82115fc0f5579b4a (diff) | |
| download | zcatch-c561c365d70c73b3842709f76a3cafaa553dead0.tar.gz zcatch-c561c365d70c73b3842709f76a3cafaa553dead0.zip | |
fixed potential crash when players leave and there are projectiles left from them
Diffstat (limited to 'src/game/server/entities')
| -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 88fa3ffa..aa0adcf5 100644 --- a/src/game/server/entities/character.cpp +++ b/src/game/server/entities/character.cpp @@ -802,7 +802,7 @@ bool CHARACTER::take_damage(vec2 force, int dmg, int from, int weapon) damage_taken_tick = server_tick(); // do damage hit sound - if(from >= 0 && from != player->client_id) + if(from >= 0 && from != player->client_id && game.players[from]) game.create_sound(game.players[from]->view_pos, SOUND_HIT, cmask_one(from)); // check for death @@ -811,7 +811,7 @@ bool CHARACTER::take_damage(vec2 force, int dmg, int from, int weapon) die(from, weapon); // set attacker's face to happy (taunt!) - if (from >= 0 && from != player->client_id) + if (from >= 0 && from != player->client_id && game.players[from]) { CHARACTER *chr = game.players[from]->get_character(); if (chr) |