Merge branch 'bones_was_here/sv_maxidle_playertospectator' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / sounds / all.inc

diff --git a/qcsrc/common/sounds/all.inc b/qcsrc/common/sounds/all.inc
index 58b145a4c2cd647e28372fdb7488fc204de6d02d..d8d60c4a129a987cd297caaa549dab804318d1ec 100644 (file)
--- a/qcsrc/common/sounds/all.inc
+++ b/qcsrc/common/sounds/all.inc
@@ -198,7 +198,8 @@ SOUND(ONS_CONTROLPOINT_BUILT, "onslaught/controlpoint_built");
 SOUND(ONS_CONTROLPOINT_UNDERATTACK, "onslaught/controlpoint_underattack");
 SOUND(ONS_DAMAGEBLOCKEDBYSHIELD, "onslaught/damageblockedbyshield");
 SOUND(ONS_ELECTRICITY_EXPLODE, "onslaught/electricity_explode");
-SOUND(ONS_GENERATOR_ALARM, "kh/alarm"); // FIXME: unique sound
+#define SND_ONS_GENERATOR_ALARM SND_KH_ALARM
+//SOUND(ONS_GENERATOR_ALARM, "kh/alarm"); // FIXME: unique sound
 SOUND(ONS_GENERATOR_DECAY, "onslaught/generator_decay");
 SOUND(ONS_GENERATOR_UNDERATTACK, "onslaught/generator_underattack");
 SOUND(ONS_HIT1, "onslaught/ons_hit1");
@@ -237,7 +238,8 @@ SOUND(VEH_SPIDERBOT_STRAFE, "vehicles/spiderbot_strafe");
 SOUND(VEH_SPIDERBOT_WALK, "vehicles/spiderbot_walk");
 
 SOUND(NADE_BEEP, "overkill/grenadebip");
-SOUND(NADE_BONUS, "kh/alarm"); // FIXME: unique sound
+#define SND_NADE_BONUS SND_KH_ALARM
+//SOUND(NADE_BONUS, "kh/alarm"); // FIXME: unique sound
 
 SOUND(BUFF_LOST, "relics/relic_effect");
 
@@ -275,6 +277,7 @@ SOUND(KILL, "misc/kill");
 SOUND(SPAWN, "misc/spawn");
 
 SOUND(TALK, "misc/talk");
+SOUND(TALK2, "misc/talk2");
 
 SOUND(TELEPORT, "misc/teleport");