Rename sounds as well

diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc
index 40c8dbeb9a60d937284b847053c85fad2378af9b..f6ef25a0bc8129b2d1d58f736837c8701c73462b 100644 (file)
--- a/data/qcsrc/client/View.qc
+++ b/data/qcsrc/client/View.qc
@@ -315,7 +315,7 @@ void CSQC_UpdateView(float w, float h)
                        {\r
                                if(!helper_health)\r
                                {\r
-                                       sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/health_low.wav"), VOL_BASEVOICE, ATTN_NONE);\r
+                                       sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/health.wav"), VOL_BASEVOICE, ATTN_NONE);\r
                                        helper_health = TRUE;\r
                                        helper_pause = time + cvar("cl_helper_pause");\r
                                        helper_ammo = time + cvar("cl_helper_pause");\r
@@ -329,7 +329,7 @@ void CSQC_UpdateView(float w, float h)
                        {\r
                                if(!helper_armor)\r
                                {\r
-                                       sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/armor_low.wav"), VOL_BASEVOICE, ATTN_NONE);\r
+                                       sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/armor.wav"), VOL_BASEVOICE, ATTN_NONE);\r
                                        helper_armor = TRUE;\r
                                        helper_pause = time + cvar("cl_helper_pause");\r
                                }\r
@@ -342,7 +342,7 @@ void CSQC_UpdateView(float w, float h)
                        {\r
                                if(!helper_ammo)\r
                                {\r
-                                       sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/ammo_low.wav"), VOL_BASEVOICE, ATTN_NONE);\r
+                                       sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/ammo.wav"), VOL_BASEVOICE, ATTN_NONE);\r
                                        helper_ammo = TRUE;\r
                                        helper_pause = time + cvar("cl_helper_pause");\r
                                }\r
@@ -355,7 +355,7 @@ void CSQC_UpdateView(float w, float h)
                        {\r
                                if(!helper_speed)\r
                                {\r
-                                       sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/speed_fast.wav"), VOL_BASEVOICE, ATTN_NONE);\r
+                                       sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/speed.wav"), VOL_BASEVOICE, ATTN_NONE);\r
                                        helper_speed = TRUE;\r
                                        helper_pause = time + cvar("cl_helper_pause");\r
                                }\r
@@ -368,7 +368,7 @@ void CSQC_UpdateView(float w, float h)
                        {\r
                                if(!helper_stomachload)\r
                                {\r
-                                       sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/stomach_load.wav"), VOL_BASEVOICE, ATTN_NONE);\r
+                                       sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/stomachload.wav"), VOL_BASEVOICE, ATTN_NONE);\r
                                        helper_stomachload = TRUE;\r
                                        helper_pause = time + cvar("cl_helper_pause");\r
                                }\r

diff --git a/data/qcsrc/client/miscfunctions.qc b/data/qcsrc/client/miscfunctions.qc
index d0de7e0d7b6a7181a4dac955f9d7782b3ac7857a..687f8a2ce31f6320a61405553de94acaab653313 100644 (file)
--- a/data/qcsrc/client/miscfunctions.qc
+++ b/data/qcsrc/client/miscfunctions.qc
@@ -181,11 +181,11 @@ void Announcer_Precache () {
        precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/lastsecond.wav"));\r
        precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/narrowly.wav"));\r
 \r
-       precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/health_low.wav"));\r
-       precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/armor_low.wav"));\r
-       precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/ammo_low.wav"));\r
-       precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/speed_fast.wav"));\r
-       precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/stomach_load.wav"));\r
+       precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/health.wav"));\r
+       precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/armor.wav"));\r
+       precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/ammo.wav"));\r
+       precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/speed.wav"));\r
+       precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/stomachload.wav"));\r
 }\r
 \r
 void AuditLists()\r

diff --git a/data/sound/helper/default/ammo.wav b/data/sound/helper/default/ammo.wav
new file mode 100644 (file)
index 0000000..568a69b
Binary files /dev/null and b/data/sound/helper/default/ammo.wav differ

diff --git a/data/sound/helper/default/ammo_low.wav b/data/sound/helper/default/ammo_low.wav
deleted file mode 100644 (file)
index 568a69b..0000000
Binary files a/data/sound/helper/default/ammo_low.wav and /dev/null differ

diff --git a/data/sound/helper/default/armor.wav b/data/sound/helper/default/armor.wav
new file mode 100644 (file)
index 0000000..f25888a
Binary files /dev/null and b/data/sound/helper/default/armor.wav differ

diff --git a/data/sound/helper/default/armor_low.wav b/data/sound/helper/default/armor_low.wav
deleted file mode 100644 (file)
index f25888a..0000000
Binary files a/data/sound/helper/default/armor_low.wav and /dev/null differ

diff --git a/data/sound/helper/default/health.wav b/data/sound/helper/default/health.wav
new file mode 100644 (file)
index 0000000..081e3bc
Binary files /dev/null and b/data/sound/helper/default/health.wav differ

diff --git a/data/sound/helper/default/health_low.wav b/data/sound/helper/default/health_low.wav
deleted file mode 100644 (file)
index 081e3bc..0000000
Binary files a/data/sound/helper/default/health_low.wav and /dev/null differ

diff --git a/data/sound/helper/default/speed.wav b/data/sound/helper/default/speed.wav
new file mode 100644 (file)
index 0000000..27e1218
Binary files /dev/null and b/data/sound/helper/default/speed.wav differ

diff --git a/data/sound/helper/default/speed_fast.wav b/data/sound/helper/default/speed_fast.wav
deleted file mode 100644 (file)
index 27e1218..0000000
Binary files a/data/sound/helper/default/speed_fast.wav and /dev/null differ

diff --git a/data/sound/helper/default/stomach_load.wav b/data/sound/helper/default/stomach_load.wav
deleted file mode 100644 (file)
index c21ff7f..0000000
Binary files a/data/sound/helper/default/stomach_load.wav and /dev/null differ

diff --git a/data/sound/helper/default/stomachload.wav b/data/sound/helper/default/stomachload.wav
new file mode 100644 (file)
index 0000000..c21ff7f
Binary files /dev/null and b/data/sound/helper/default/stomachload.wav differ