about summary refs log tree commit diff
diff options
context:
space:
mode:
authorJoel de Vahl <joel@stalverk80.se>2007-07-22 14:16:57 +0000
committerJoel de Vahl <joel@stalverk80.se>2007-07-22 14:16:57 +0000
commit48ed41b105019a3b3bb75d1b85e06a30e6718c8d (patch)
tree59584e0eeb2d0a668015e2110a8a5e8122a935b1
parentab2fe36b59eea28d9e6822c611815d48f3647e9f (diff)
downloadzcatch-48ed41b105019a3b3bb75d1b85e06a30e6718c8d.tar.gz
zcatch-48ed41b105019a3b3bb75d1b85e06a30e6718c8d.zip
Hammer hit sound.
-rw-r--r--datasrc/teewars.ds6
-rw-r--r--src/game/server/game_server.cpp1
2 files changed, 7 insertions, 0 deletions
diff --git a/datasrc/teewars.ds b/datasrc/teewars.ds
index 760e8165..b0f55e19 100644
--- a/datasrc/teewars.ds
+++ b/datasrc/teewars.ds
@@ -22,6 +22,12 @@ sounds {
 		"data/audio/wp_hammer_swing-02.wav"
 		"data/audio/wp_hammer_swing-03.wav"
 	}
+
+	hammer_hit {
+		"data/audio/wp_hammer_hit-01.wav"
+		"data/audio/wp_hammer_hit-02.wav"
+		"data/audio/wp_hammer_hit-03.wav"
+	}
 	
 	ninja_fire { 
 		"data/audio/wp_ninja_attack-01.wav"
diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp
index 03891e24..82e6820f 100644
--- a/src/game/server/game_server.cpp
+++ b/src/game/server/game_server.cpp
@@ -962,6 +962,7 @@ int player::handle_weapons()
 
 			// set his velocity to fast upward (for now)
 			create_smoke(ents[i]->pos);
+			create_sound(pos, SOUND_HAMMER_HIT);
 			hitobjects[numobjectshit++] = ents[i];
 			ents[i]->take_damage(vec2(0,10.0f), data->weapons[active_weapon].meleedamage, client_id, active_weapon);
 			player* target = (player*)ents[i];