diff options
| -rw-r--r-- | datasrc/teewars.ds | 18 | ||||
| -rw-r--r-- | src/game/server/game_server.cpp | 8 |
2 files changed, 26 insertions, 0 deletions
diff --git a/datasrc/teewars.ds b/datasrc/teewars.ds index f920b10a..9e1e51cc 100644 --- a/datasrc/teewars.ds +++ b/datasrc/teewars.ds @@ -122,6 +122,24 @@ sounds { "data/audio/hook_attach-02.wav" "data/audio/hook_attach-03.wav" } + + pickup_health { + "data/audio/sfx_pickup_hrt-01.wav" + "data/audio/sfx_pickup_hrt-02.wav" + } + + pickup_armor { + "data/audio/sfx_pickup_arm-01.wav" + "data/audio/sfx_pickup_arm-02.wav" + "data/audio/sfx_pickup_arm-03.wav" + "data/audio/sfx_pickup_arm-04.wav" + } + + weapon_spawn { + "data/audio/sfx_spawn_wpn-01.wav" + "data/audio/sfx_spawn_wpn-02.wav" + "data/audio/sfx_spawn_wpn-03.wav" + } } diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp index fa7493bf..844fb3ab 100644 --- a/src/game/server/game_server.cpp +++ b/src/game/server/game_server.cpp @@ -1393,7 +1393,13 @@ void powerup::tick() if(spawntick > 0) { if(server_tick() > spawntick) + { + // respawn spawntick = -1; + + if(type == POWERUP_WEAPON) + create_sound(pos, SOUND_WEAPON_SPAWN, 0); + } else return; } @@ -1409,6 +1415,7 @@ void powerup::tick() case POWERUP_HEALTH: if(pplayer->health < data->playerinfo[gameobj.gametype].maxhealth) { + create_sound(pos, SOUND_PICKUP_HEALTH, 0); pplayer->health = min((int)data->playerinfo[gameobj.gametype].maxhealth, pplayer->health + data->powerupinfo[type].amount); respawntime = data->powerupinfo[type].respawntime; } @@ -1416,6 +1423,7 @@ void powerup::tick() case POWERUP_ARMOR: if(pplayer->armor < data->playerinfo[gameobj.gametype].maxarmor) { + create_sound(pos, SOUND_PICKUP_ARMOR, 0); pplayer->armor = min((int)data->playerinfo[gameobj.gametype].maxarmor, pplayer->armor + data->powerupinfo[type].amount); respawntime = data->powerupinfo[type].respawntime; } |