From: MirceaKitsune Date: Tue, 2 Aug 2011 16:46:28 +0000 (+0300) Subject: Rename sounds as well X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=4ceac745e3a97d9c247fc4157f9a8ef11da2f9fc;p=voretournament%2Fvoretournament.git Rename sounds as well --- diff --git a/data/qcsrc/client/View.qc b/data/qcsrc/client/View.qc index 40c8dbeb..f6ef25a0 100644 --- a/data/qcsrc/client/View.qc +++ b/data/qcsrc/client/View.qc @@ -315,7 +315,7 @@ void CSQC_UpdateView(float w, float h) { if(!helper_health) { - sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/health_low.wav"), VOL_BASEVOICE, ATTN_NONE); + sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/health.wav"), VOL_BASEVOICE, ATTN_NONE); helper_health = TRUE; helper_pause = time + cvar("cl_helper_pause"); helper_ammo = time + cvar("cl_helper_pause"); @@ -329,7 +329,7 @@ void CSQC_UpdateView(float w, float h) { if(!helper_armor) { - sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/armor_low.wav"), VOL_BASEVOICE, ATTN_NONE); + sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/armor.wav"), VOL_BASEVOICE, ATTN_NONE); helper_armor = TRUE; helper_pause = time + cvar("cl_helper_pause"); } @@ -342,7 +342,7 @@ void CSQC_UpdateView(float w, float h) { if(!helper_ammo) { - sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/ammo_low.wav"), VOL_BASEVOICE, ATTN_NONE); + sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/ammo.wav"), VOL_BASEVOICE, ATTN_NONE); helper_ammo = TRUE; helper_pause = time + cvar("cl_helper_pause"); } @@ -355,7 +355,7 @@ void CSQC_UpdateView(float w, float h) { if(!helper_speed) { - sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/speed_fast.wav"), VOL_BASEVOICE, ATTN_NONE); + sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/speed.wav"), VOL_BASEVOICE, ATTN_NONE); helper_speed = TRUE; helper_pause = time + cvar("cl_helper_pause"); } @@ -368,7 +368,7 @@ void CSQC_UpdateView(float w, float h) { if(!helper_stomachload) { - sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/stomach_load.wav"), VOL_BASEVOICE, ATTN_NONE); + sound(self, CHAN_VOICE, strcat("helper/", cvar_string("cl_helper_voice"), "/stomachload.wav"), VOL_BASEVOICE, ATTN_NONE); helper_stomachload = TRUE; helper_pause = time + cvar("cl_helper_pause"); } diff --git a/data/qcsrc/client/miscfunctions.qc b/data/qcsrc/client/miscfunctions.qc index d0de7e0d..687f8a2c 100644 --- 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")); precache_sound (strcat("announcer/", cvar_string("cl_announcer"), "/narrowly.wav")); - precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/health_low.wav")); - precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/armor_low.wav")); - precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/ammo_low.wav")); - precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/speed_fast.wav")); - precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/stomach_load.wav")); + precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/health.wav")); + precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/armor.wav")); + precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/ammo.wav")); + precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/speed.wav")); + precache_sound (strcat("helper/", cvar_string("cl_helper_voice"), "/stomachload.wav")); } void AuditLists() diff --git a/data/sound/helper/default/ammo.wav b/data/sound/helper/default/ammo.wav new file mode 100644 index 00000000..568a69b8 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 index 568a69b8..00000000 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 index 00000000..f25888a5 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 index f25888a5..00000000 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 index 00000000..081e3bc2 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 index 081e3bc2..00000000 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 index 00000000..27e1218f 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 index 27e1218f..00000000 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 index c21ff7fd..00000000 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 index 00000000..c21ff7fd Binary files /dev/null and b/data/sound/helper/default/stomachload.wav differ