diff options
| author | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-03-17 01:41:11 +0000 |
|---|---|---|
| committer | Magnus Auvinen <magnus.auvinen@gmail.com> | 2008-03-17 01:41:11 +0000 |
| commit | 22360b5d795164df0c7a80a88f5b7cb1c230e6f0 (patch) | |
| tree | df7a55964ebd5a054689ed53ad7b1c56b4284314 /src/game/server | |
| parent | 412958bae395c50892ce390b84e309ce827e9b13 (diff) | |
| download | zcatch-22360b5d795164df0c7a80a88f5b7cb1c230e6f0.tar.gz zcatch-22360b5d795164df0c7a80a88f5b7cb1c230e6f0.zip | |
blood color depending on skin fixed
Diffstat (limited to 'src/game/server')
| -rw-r--r-- | src/game/server/gs_server.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/game/server/gs_server.cpp b/src/game/server/gs_server.cpp index 88577118..b415fabd 100644 --- a/src/game/server/gs_server.cpp +++ b/src/game/server/gs_server.cpp @@ -21,7 +21,7 @@ void create_damageind(vec2 p, float angle_mod, int amount); void create_explosion(vec2 p, int owner, int weapon, bool bnodamage); void create_smoke(vec2 p); void create_playerspawn(vec2 p); -void create_death(vec2 p); +void create_death(vec2 p, int who); void create_sound(vec2 pos, int sound, int mask=-1); class player *intersect_player(vec2 pos0, vec2 pos1, vec2 &new_pos, class entity *notthis = 0); class player *closest_player(vec2 pos, float radius, entity *notthis); @@ -1523,7 +1523,7 @@ void player::die(int killer, int weapon) dead = true; die_tick = server_tick(); clear_flag(FLAG_PHYSICS); - create_death(pos); + create_death(pos, client_id); } bool player::take_damage(vec2 force, int dmg, int from, int weapon) @@ -1907,7 +1907,7 @@ void create_playerspawn(vec2 p) } } -void create_death(vec2 p) +void create_death(vec2 p, int cid) { // create the event NETEVENT_DEATH *ev = (NETEVENT_DEATH *)events.create(NETEVENTTYPE_DEATH, sizeof(NETEVENT_DEATH)); @@ -1915,6 +1915,7 @@ void create_death(vec2 p) { ev->x = (int)p.x; ev->y = (int)p.y; + ev->cid = cid; } } |