diff options
| -rw-r--r-- | src/engine/client/snd.cpp | 2 | ||||
| -rw-r--r-- | src/game/server/game_server.cpp | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/src/engine/client/snd.cpp b/src/engine/client/snd.cpp index 52cb9dc5..23e20d4c 100644 --- a/src/engine/client/snd.cpp +++ b/src/engine/client/snd.cpp @@ -391,7 +391,7 @@ int snd_load_wav(const char *filename) } if(id >= 0) - dbg_msg("sound/wav", "loaded %s, sustain start: %d end: %d", filename, sounds[id].sound.sustain_start, sounds[id].sound.sustain_end); + dbg_msg("sound/wav", "loaded %s", filename); else dbg_msg("sound/wav", "failed to load %s", filename); diff --git a/src/game/server/game_server.cpp b/src/game/server/game_server.cpp index 3d7280e0..cf8cea90 100644 --- a/src/game/server/game_server.cpp +++ b/src/game/server/game_server.cpp @@ -616,6 +616,7 @@ void player::handle_weapons() switch(active_weapon) { case WEAPON_HAMMER: + create_sound(pos, SOUND_HAMMER_FIRE); break; case WEAPON_GUN: @@ -626,6 +627,7 @@ void player::handle_weapons() 100, this, 1, 0, 0, -1, WEAPON_GUN); + create_sound(pos, SOUND_GUN_FIRE); break; case WEAPON_ROCKET: new projectile(WEAPON_PROJECTILETYPE_ROCKET, @@ -634,7 +636,8 @@ void player::handle_weapons() direction*15.0f, 100, this, - 1, projectile::PROJECTILE_FLAGS_EXPLODE, 0, -1, WEAPON_ROCKET); + 1, projectile::PROJECTILE_FLAGS_EXPLODE, 0, SOUND_ROCKET_EXPLODE, WEAPON_ROCKET); + create_sound(pos, SOUND_ROCKET_FIRE); break; case WEAPON_SHOTGUN: for(int i = -2; i <= 2; i++) @@ -650,6 +653,7 @@ void player::handle_weapons() this, 1, 0, 0, -1, WEAPON_SHOTGUN); } + create_sound(pos, SOUND_SHOTGUN_FIRE); break; } |