about summary refs log tree commit diff
path: root/src/game/server/game_server.cpp
diff options
context:
space:
mode:
authorMagnus Auvinen <magnus.auvinen@gmail.com>2007-08-03 06:35:35 +0000
committerMagnus Auvinen <magnus.auvinen@gmail.com>2007-08-03 06:35:35 +0000
commit770313761870b3e68049fa894f097a8bbec80420 (patch)
tree50d3e52ae1d46943cf998caefcb3076d840f2ff8 /src/game/server/game_server.cpp
parent681fbaf011cd50eb78473da3daad08196d14f614 (diff)
downloadzcatch-770313761870b3e68049fa894f097a8bbec80420.tar.gz
zcatch-770313761870b3e68049fa894f097a8bbec80420.zip
added pickup sounds for the weapons
Diffstat (limited to 'src/game/server/game_server.cpp')
-rw-r--r--src/game/server/game_server.cpp7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index 841be9b8..d5ba355f 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -1455,6 +1455,12 @@ void powerup::tick()
 					pplayer->weapons[subtype].got = true;
 					pplayer->weapons[subtype].ammo = min(10, pplayer->weapons[subtype].ammo + data->powerupinfo[type].amount);
 					respawntime = data->powerupinfo[type].respawntime;
+					
+					// TODO: data compiler should take care of stuff like this
+					if(subtype == WEAPON_ROCKET)
+						create_sound(pos, SOUND_PICKUP_ROCKET);
+					else if(subtype == WEAPON_SHOTGUN)
+						create_sound(pos, SOUND_PICKUP_SHOTGUN);
 				}
 			}
 			break;
@@ -1465,6 +1471,7 @@ void powerup::tick()
 				pplayer->weapons[WEAPON_NINJA].got = true;
 				pplayer->active_weapon = WEAPON_NINJA;
 				respawntime = data->powerupinfo[type].respawntime;
+				create_sound(pos, SOUND_PICKUP_NINJA);
 				break;
 			}
 		default: