rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-10 23:32:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added the AQDT CTB sounds to the base radio paks

Browse source
This commit is contained in:
Richard Allen 2002-07-20 02:25:53 +00:00
parent 91f4196f51
commit 59ab9382bc
4 changed files with 76 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.109 2002/07/20 02:25:53 jbravo
// Added the AQDT CTB sounds to the base radio paks
//
// Revision 1.108 2002/07/19 04:40:56 jbravo
// Added 2 new radio sets and ctb radio sound support
//
@ -1368,11 +1371,11 @@ typedef struct {
// JBravo: Radio sounds
//Slicer
sfxHandle_t male_sounds[26];
sfxHandle_t male_sounds[55];
sfxHandle_t new_male_sounds[55];
sfxHandle_t pikey_male_sounds[55];
sfxHandle_t pirate_male_sounds[55];
sfxHandle_t female_sounds[26];
sfxHandle_t female_sounds[55];
sfxHandle_t steamSound;
sfxHandle_t male_1sound;

64
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.98 2002/07/20 02:25:53 jbravo
// Added the AQDT CTB sounds to the base radio paks
//
// Revision 1.97 2002/07/19 04:40:56 jbravo
// Added 2 new radio sets and ctb radio sound support
//
@ -922,6 +925,36 @@ static void CG_RegisterSounds(void)
cgs.media.male_sounds[23] = trap_S_RegisterSound("sound/radio/male/treport.wav", qtrue);
cgs.media.male_sounds[24] = trap_S_RegisterSound("sound/radio/male/up.wav", qtrue);
cgs.media.male_sounds[25] = trap_S_RegisterSound("sound/radio/click.wav", qtrue);
cgs.media.male_sounds[26] = trap_S_RegisterSound("sound/radio/male/backup1.wav", qtrue);
cgs.media.male_sounds[27] = trap_S_RegisterSound("sound/radio/male/backup2.wav", qtrue);
cgs.media.male_sounds[28] = trap_S_RegisterSound("sound/radio/male/backup3.wav", qtrue);
cgs.media.male_sounds[29] = trap_S_RegisterSound("sound/radio/male/chit1.wav", qtrue);
cgs.media.male_sounds[30] = trap_S_RegisterSound("sound/radio/male/chit2.wav", qtrue);
cgs.media.male_sounds[31] = trap_S_RegisterSound("sound/radio/male/chit3.wav", qtrue);
cgs.media.male_sounds[32] = trap_S_RegisterSound("sound/radio/male/deliv1.wav", qtrue);
cgs.media.male_sounds[33] = trap_S_RegisterSound("sound/radio/male/deliv2.wav", qtrue);
cgs.media.male_sounds[34] = trap_S_RegisterSound("sound/radio/male/deliv3.wav", qtrue);
cgs.media.male_sounds[35] = trap_S_RegisterSound("sound/radio/male/ecdown1.wav", qtrue);
cgs.media.male_sounds[36] = trap_S_RegisterSound("sound/radio/male/ecdown2.wav", qtrue);
cgs.media.male_sounds[37] = trap_S_RegisterSound("sound/radio/male/ecdown3.wav", qtrue);
cgs.media.male_sounds[38] = trap_S_RegisterSound("sound/radio/male/enepak1.wav", qtrue);
cgs.media.male_sounds[39] = trap_S_RegisterSound("sound/radio/male/enepak2.wav", qtrue);
cgs.media.male_sounds[40] = trap_S_RegisterSound("sound/radio/male/enepak3.wav", qtrue);
cgs.media.male_sounds[41] = trap_S_RegisterSound("sound/radio/male/escort1.wav", qtrue);
cgs.media.male_sounds[42] = trap_S_RegisterSound("sound/radio/male/escort2.wav", qtrue);
cgs.media.male_sounds[43] = trap_S_RegisterSound("sound/radio/male/escort3.wav", qtrue);
cgs.media.male_sounds[44] = trap_S_RegisterSound("sound/radio/male/gotpak1.wav", qtrue);
cgs.media.male_sounds[45] = trap_S_RegisterSound("sound/radio/male/gotpak2.wav", qtrue);
cgs.media.male_sounds[46] = trap_S_RegisterSound("sound/radio/male/gotpak3.wav", qtrue);
cgs.media.male_sounds[47] = trap_S_RegisterSound("sound/radio/male/guard1.wav", qtrue);
cgs.media.male_sounds[48] = trap_S_RegisterSound("sound/radio/male/guard2.wav", qtrue);
cgs.media.male_sounds[49] = trap_S_RegisterSound("sound/radio/male/guard3.wav", qtrue);
cgs.media.male_sounds[50] = trap_S_RegisterSound("sound/radio/male/incoming1.wav", qtrue);
cgs.media.male_sounds[51] = trap_S_RegisterSound("sound/radio/male/incoming2.wav", qtrue);
cgs.media.male_sounds[52] = trap_S_RegisterSound("sound/radio/male/incoming3.wav", qtrue);
cgs.media.male_sounds[53] = trap_S_RegisterSound("sound/radio/male/plost1.wav", qtrue);
cgs.media.male_sounds[54] = trap_S_RegisterSound("sound/radio/male/plost2.wav", qtrue);
cgs.media.male_sounds[55] = trap_S_RegisterSound("sound/radio/male/plost3.wav", qtrue);
cgs.media.new_male_sounds[0] = trap_S_RegisterSound("sound/newradio/male/1.wav", qtrue);
cgs.media.new_male_sounds[1] = trap_S_RegisterSound("sound/newradio/male/2.wav", qtrue);
cgs.media.new_male_sounds[2] = trap_S_RegisterSound("sound/newradio/male/3.wav", qtrue);
@ -1116,7 +1149,36 @@ static void CG_RegisterSounds(void)
cgs.media.female_sounds[23] = trap_S_RegisterSound("sound/radio/female/treport.wav", qtrue);
cgs.media.female_sounds[24] = trap_S_RegisterSound("sound/radio/female/up.wav", qtrue);
cgs.media.female_sounds[25] = trap_S_RegisterSound("sound/radio/click.wav", qtrue);
cgs.media.female_sounds[26] = trap_S_RegisterSound("sound/radio/female/backup1.wav", qtrue);
cgs.media.female_sounds[27] = trap_S_RegisterSound("sound/radio/female/backup2.wav", qtrue);
cgs.media.female_sounds[28] = trap_S_RegisterSound("sound/radio/female/backup3.wav", qtrue);
cgs.media.female_sounds[29] = trap_S_RegisterSound("sound/radio/female/chit1.wav", qtrue);
cgs.media.female_sounds[30] = trap_S_RegisterSound("sound/radio/female/chit2.wav", qtrue);
cgs.media.female_sounds[31] = trap_S_RegisterSound("sound/radio/female/chit3.wav", qtrue);
cgs.media.female_sounds[32] = trap_S_RegisterSound("sound/radio/female/deliv1.wav", qtrue);
cgs.media.female_sounds[33] = trap_S_RegisterSound("sound/radio/female/deliv2.wav", qtrue);
cgs.media.female_sounds[34] = trap_S_RegisterSound("sound/radio/female/deliv3.wav", qtrue);
cgs.media.female_sounds[35] = trap_S_RegisterSound("sound/radio/female/ecdown1.wav", qtrue);
cgs.media.female_sounds[36] = trap_S_RegisterSound("sound/radio/female/ecdown2.wav", qtrue);
cgs.media.female_sounds[37] = trap_S_RegisterSound("sound/radio/female/ecdown3.wav", qtrue);
cgs.media.female_sounds[38] = trap_S_RegisterSound("sound/radio/female/enepak1.wav", qtrue);
cgs.media.female_sounds[39] = trap_S_RegisterSound("sound/radio/female/enepak2.wav", qtrue);
cgs.media.female_sounds[40] = trap_S_RegisterSound("sound/radio/female/enepak3.wav", qtrue);
cgs.media.female_sounds[41] = trap_S_RegisterSound("sound/radio/female/escort1.wav", qtrue);
cgs.media.female_sounds[42] = trap_S_RegisterSound("sound/radio/female/escort2.wav", qtrue);
cgs.media.female_sounds[43] = trap_S_RegisterSound("sound/radio/female/escort3.wav", qtrue);
cgs.media.female_sounds[44] = trap_S_RegisterSound("sound/radio/female/gotpak1.wav", qtrue);
cgs.media.female_sounds[45] = trap_S_RegisterSound("sound/radio/female/gotpak2.wav", qtrue);
cgs.media.female_sounds[46] = trap_S_RegisterSound("sound/radio/female/gotpak3.wav", qtrue);
cgs.media.female_sounds[47] = trap_S_RegisterSound("sound/radio/female/guard1.wav", qtrue);
cgs.media.female_sounds[48] = trap_S_RegisterSound("sound/radio/female/guard2.wav", qtrue);
cgs.media.female_sounds[49] = trap_S_RegisterSound("sound/radio/female/guard3.wav", qtrue);
cgs.media.female_sounds[50] = trap_S_RegisterSound("sound/radio/female/incoming1.wav", qtrue);
cgs.media.female_sounds[51] = trap_S_RegisterSound("sound/radio/female/incoming2.wav", qtrue);
cgs.media.female_sounds[52] = trap_S_RegisterSound("sound/radio/female/incoming3.wav", qtrue);
cgs.media.female_sounds[53] = trap_S_RegisterSound("sound/radio/female/plost1.wav", qtrue);
cgs.media.female_sounds[54] = trap_S_RegisterSound("sound/radio/female/plost2.wav", qtrue);
cgs.media.female_sounds[55] = trap_S_RegisterSound("sound/radio/female/plost3.wav", qtrue);
cgs.media.captureAwardSound = trap_S_RegisterSound("sound/teamplay/flagcapture_yourteam.wav", qtrue);
cgs.media.redLeadsSound = trap_S_RegisterSound("sound/feedback/redleads.wav", qtrue);
cgs.media.blueLeadsSound = trap_S_RegisterSound("sound/feedback/blueleads.wav", qtrue);

11
reaction/cgame/cg_servercmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.58 2002/07/20 02:25:53 jbravo
// Added the AQDT CTB sounds to the base radio paks
//
// Revision 1.57 2002/07/19 04:40:56 jbravo
// Added 2 new radio sets and ctb radio sound support
//
@ -1102,10 +1105,7 @@ void CG_Radio(void)
//Slicer optimization
if (!gender) {
if (cg_RQ3_radiovoice_male.integer == 0) {
if (sound > 25)
CG_AddBufferedSound(cgs.media.new_male_sounds[sound]);
else
CG_AddBufferedSound(cgs.media.male_sounds[sound]);
CG_AddBufferedSound(cgs.media.male_sounds[sound]);
} else if (cg_RQ3_radiovoice_male.integer == 1) {
CG_AddBufferedSound(cgs.media.new_male_sounds[sound]);
} else if (cg_RQ3_radiovoice_male.integer == 2) {
@ -1114,9 +1114,6 @@ void CG_Radio(void)
CG_AddBufferedSound(cgs.media.pirate_male_sounds[sound]);
}
} else {
if (sound > 25)
CG_AddBufferedSound(cgs.media.new_male_sounds[sound]);
else
CG_AddBufferedSound(cgs.media.female_sounds[sound]);
}
return;

4
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.110 2002/07/20 02:25:53 jbravo
// Added the AQDT CTB sounds to the base radio paks
//
// Revision 1.109 2002/07/07 18:36:13 jbravo
// Added an AntiIdle system. Can play insane sounds for idle players, drop them
// from teams or kick them. Upped version to Beta 2.1
@ -1322,6 +1325,7 @@ void player_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, i
AddScore(attacker, self->r.currentOrigin, 1);
} else if (g_gametype.integer == GT_CTF) {
attacker->client->killStreak = 0;
AddScore(attacker, self->r.currentOrigin, 1);
} else {
attacker->client->killStreak++;
}