about summary refs log tree commit diff
path: root/src/game
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-07-29 16:44:30 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-07-29 16:44:30 +0000
commit2cb87d92bae27a240b938829d20249201cbb8712 (patch)
tree66effcda33ac53f672dfc67061357b840d6d7b7c /src/game
parentc6b013443dae85fc50600432830cb1e675a343b0 (diff)
downloadzcatch-2cb87d92bae27a240b938829d20249201cbb8712.tar.gz
zcatch-2cb87d92bae27a240b938829d20249201cbb8712.zip
added pickup sounds for health and armor. added sounds for weapon respawn
Diffstat (limited to 'src/game')
-rw-r--r--src/game/server/game_server.cpp8
1 files changed, 8 insertions, 0 deletions
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;
 			}