edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-10 01:58:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

happy is now on kill instead of on spawn

Browse source
This commit is contained in:
Jakob Fries 2007-08-09 00:35:27 +00:00
parent d5e3c556bf
commit c488c35707
1 changed files with 11 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/game/server/game_server.cpp
View file

@ -807,9 +807,6 @@ void player::try_respawn()
active_weapon = WEAPON_GUN;
reload_timer = 0;
emote_type = EMOTE_HAPPY;
emote_stop = server_tick() + server_tickspeed();
// Create sound and spawn effects
create_sound(pos, SOUND_PLAYER_SPAWN);
create_spawn(pos);
@ -1410,7 +1407,7 @@ bool player::take_damage(vec2 force, int dmg, int from, int weapon)
// do damage hit sound
if(from >= 0)
create_targetted_sound(players[from].pos, SOUND_HIT, from);
create_targetted_sound(get_player(from)->pos, SOUND_HIT, from);
// check for death
if(health <= 0)
@ -1428,6 +1425,16 @@ bool player::take_damage(vec2 force, int dmg, int from, int weapon)
}
die(from, weapon);
// set attacker's face to happy (taunt!)
if (from >= 0 && from != client_id)
{
player *p = get_player(from);
p->emote_type = EMOTE_HAPPY;
p->emote_stop = server_tick() + server_tickspeed();
}
return false;
}