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 2 new radio sets and ctb radio sound support

Browse source
This commit is contained in:
Richard Allen 2002-07-19 04:40:56 +00:00
parent 1d6334f16d
commit 91f4196f51
5 changed files with 250 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.108 2002/07/19 04:40:56 jbravo
// Added 2 new radio sets and ctb radio sound support
//
// Revision 1.107 2002/07/19 04:32:42 niceass
// added marker support for ctb
//
@ -1366,7 +1369,9 @@ typedef struct {
//Slicer
sfxHandle_t male_sounds[26];
sfxHandle_t new_male_sounds[26];
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 steamSound;
@ -1623,8 +1628,8 @@ extern vmCvar_t cg_RQ3_overlaycrosshair;
// JBravo: cvar for tkok popups
extern vmCvar_t cg_RQ3_tkokAutoPopup;
extern vmCvar_t cg_RQ3_newradio_male;
extern vmCvar_t cg_RQ3_newradio_female;
extern vmCvar_t cg_RQ3_radiovoice_male;
extern vmCvar_t cg_RQ3_radiovoice_female;
// Slicer: for the Anti-Cheat System
//extern vmCvar_t cg_RQ3_Auth;

155
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.97 2002/07/19 04:40:56 jbravo
// Added 2 new radio sets and ctb radio sound support
//
// Revision 1.96 2002/07/19 04:32:09 niceass
// added marker support for ctb
//
@ -367,8 +370,8 @@ vmCvar_t cg_RQ3_overlaycrosshair;
// JBravo: cvar for tkok popup
vmCvar_t cg_RQ3_tkokAutoPopup;
vmCvar_t cg_RQ3_newradio_male;
vmCvar_t cg_RQ3_newradio_female;
vmCvar_t cg_RQ3_radiovoice_male;
vmCvar_t cg_RQ3_radiovoice_female;
// Slicer: for the Anti-Cheat System
//vmCvar_t cg_RQ3_Auth;
@ -598,8 +601,8 @@ static cvarTable_t cvarTable[] = { // bk001129
{&cg_RQ3_crosshairColorB, "cg_RQ3_crosshairColorB", "1.0", CVAR_ARCHIVE},
{&cg_RQ3_crosshairColorA, "cg_RQ3_crosshairColorA", "1.0", CVAR_ARCHIVE},
{&cg_RQ3_tkokAutoPopup, "cg_RQ3_tkokAutoPopup", "0", CVAR_ARCHIVE},
{&cg_RQ3_newradio_male, "cg_RQ3_newradio_male", "1", CVAR_ARCHIVE},
{&cg_RQ3_newradio_female, "cg_RQ3_newradio_female", "1", CVAR_ARCHIVE},
{&cg_RQ3_radiovoice_male, "cg_RQ3_radiovoice_male", "1", CVAR_ARCHIVE},
{&cg_RQ3_radiovoice_female, "cg_RQ3_radiovoice_female", "1", CVAR_ARCHIVE},
{&cg_RQ3_impactEffects, "cg_RQ3_impactEffects", "1", CVAR_ARCHIVE},
{&cg_RQ3_laserAssist, "cg_RQ3_laserAssist", "0", CVAR_ARCHIVE},
{&cg_RQ3_anouncer, "cg_RQ3_announcer", "1", CVAR_ARCHIVE},
@ -944,7 +947,149 @@ static void CG_RegisterSounds(void)
cgs.media.new_male_sounds[22] = trap_S_RegisterSound("sound/newradio/male/teamdown.wav", qtrue);
cgs.media.new_male_sounds[23] = trap_S_RegisterSound("sound/newradio/male/treport.wav", qtrue);
cgs.media.new_male_sounds[24] = trap_S_RegisterSound("sound/newradio/male/up.wav", qtrue);
cgs.media.new_male_sounds[25] = trap_S_RegisterSound("sound/newradio/click.wav", qtrue);
cgs.media.new_male_sounds[25] = trap_S_RegisterSound("sound/radio/click.wav", qtrue);
cgs.media.new_male_sounds[26] = trap_S_RegisterSound("sound/newradio/male/backup1.wav", qtrue);
cgs.media.new_male_sounds[27] = trap_S_RegisterSound("sound/newradio/male/backup2.wav", qtrue);
cgs.media.new_male_sounds[28] = trap_S_RegisterSound("sound/newradio/male/backup3.wav", qtrue);
cgs.media.new_male_sounds[29] = trap_S_RegisterSound("sound/newradio/male/chit1.wav", qtrue);
cgs.media.new_male_sounds[30] = trap_S_RegisterSound("sound/newradio/male/chit2.wav", qtrue);
cgs.media.new_male_sounds[31] = trap_S_RegisterSound("sound/newradio/male/chit3.wav", qtrue);
cgs.media.new_male_sounds[32] = trap_S_RegisterSound("sound/newradio/male/deliv1.wav", qtrue);
cgs.media.new_male_sounds[33] = trap_S_RegisterSound("sound/newradio/male/deliv2.wav", qtrue);
cgs.media.new_male_sounds[34] = trap_S_RegisterSound("sound/newradio/male/deliv3.wav", qtrue);
cgs.media.new_male_sounds[35] = trap_S_RegisterSound("sound/newradio/male/ecdown1.wav", qtrue);
cgs.media.new_male_sounds[36] = trap_S_RegisterSound("sound/newradio/male/ecdown2.wav", qtrue);
cgs.media.new_male_sounds[37] = trap_S_RegisterSound("sound/newradio/male/ecdown3.wav", qtrue);
cgs.media.new_male_sounds[38] = trap_S_RegisterSound("sound/newradio/male/enepak1.wav", qtrue);
cgs.media.new_male_sounds[39] = trap_S_RegisterSound("sound/newradio/male/enepak2.wav", qtrue);
cgs.media.new_male_sounds[40] = trap_S_RegisterSound("sound/newradio/male/enepak3.wav", qtrue);
cgs.media.new_male_sounds[41] = trap_S_RegisterSound("sound/newradio/male/escort1.wav", qtrue);
cgs.media.new_male_sounds[42] = trap_S_RegisterSound("sound/newradio/male/escort2.wav", qtrue);
cgs.media.new_male_sounds[43] = trap_S_RegisterSound("sound/newradio/male/escort3.wav", qtrue);
cgs.media.new_male_sounds[44] = trap_S_RegisterSound("sound/newradio/male/gotpak1.wav", qtrue);
cgs.media.new_male_sounds[45] = trap_S_RegisterSound("sound/newradio/male/gotpak2.wav", qtrue);
cgs.media.new_male_sounds[46] = trap_S_RegisterSound("sound/newradio/male/gotpak3.wav", qtrue);
cgs.media.new_male_sounds[47] = trap_S_RegisterSound("sound/newradio/male/guard1.wav", qtrue);
cgs.media.new_male_sounds[48] = trap_S_RegisterSound("sound/newradio/male/guard2.wav", qtrue);
cgs.media.new_male_sounds[49] = trap_S_RegisterSound("sound/newradio/male/guard3.wav", qtrue);
cgs.media.new_male_sounds[50] = trap_S_RegisterSound("sound/newradio/male/incoming1.wav", qtrue);
cgs.media.new_male_sounds[51] = trap_S_RegisterSound("sound/newradio/male/incoming2.wav", qtrue);
cgs.media.new_male_sounds[52] = trap_S_RegisterSound("sound/newradio/male/incoming3.wav", qtrue);
cgs.media.new_male_sounds[53] = trap_S_RegisterSound("sound/newradio/male/plost1.wav", qtrue);
cgs.media.new_male_sounds[54] = trap_S_RegisterSound("sound/newradio/male/plost2.wav", qtrue);
cgs.media.new_male_sounds[55] = trap_S_RegisterSound("sound/newradio/male/plost3.wav", qtrue);
cgs.media.pikey_male_sounds[0] = trap_S_RegisterSound("sound/newradio/pikey/1.wav", qtrue);
cgs.media.pikey_male_sounds[1] = trap_S_RegisterSound("sound/newradio/pikey/2.wav", qtrue);
cgs.media.pikey_male_sounds[2] = trap_S_RegisterSound("sound/newradio/pikey/3.wav", qtrue);
cgs.media.pikey_male_sounds[3] = trap_S_RegisterSound("sound/newradio/pikey/4.wav", qtrue);
cgs.media.pikey_male_sounds[4] = trap_S_RegisterSound("sound/newradio/pikey/5.wav", qtrue);
cgs.media.pikey_male_sounds[5] = trap_S_RegisterSound("sound/newradio/pikey/6.wav", qtrue);
cgs.media.pikey_male_sounds[6] = trap_S_RegisterSound("sound/newradio/pikey/7.wav", qtrue);
cgs.media.pikey_male_sounds[7] = trap_S_RegisterSound("sound/newradio/pikey/8.wav", qtrue);
cgs.media.pikey_male_sounds[8] = trap_S_RegisterSound("sound/newradio/pikey/9.wav", qtrue);
cgs.media.pikey_male_sounds[9] = trap_S_RegisterSound("sound/newradio/pikey/10.wav", qtrue);
cgs.media.pikey_male_sounds[10] = trap_S_RegisterSound("sound/newradio/pikey/back.wav", qtrue);
cgs.media.pikey_male_sounds[11] = trap_S_RegisterSound("sound/newradio/pikey/cover.wav", qtrue);
cgs.media.pikey_male_sounds[12] = trap_S_RegisterSound("sound/newradio/pikey/down.wav", qtrue);
cgs.media.pikey_male_sounds[13] = trap_S_RegisterSound("sound/newradio/pikey/enemyd.wav", qtrue);
cgs.media.pikey_male_sounds[14] = trap_S_RegisterSound("sound/newradio/pikey/enemys.wav", qtrue);
cgs.media.pikey_male_sounds[15] = trap_S_RegisterSound("sound/newradio/pikey/forward.wav", qtrue);
cgs.media.pikey_male_sounds[16] = trap_S_RegisterSound("sound/newradio/pikey/go.wav", qtrue);
cgs.media.pikey_male_sounds[17] = trap_S_RegisterSound("sound/newradio/pikey/im_hit.wav", qtrue);
cgs.media.pikey_male_sounds[18] = trap_S_RegisterSound("sound/newradio/pikey/left.wav", qtrue);
cgs.media.pikey_male_sounds[19] = trap_S_RegisterSound("sound/newradio/pikey/reportin.wav", qtrue);
cgs.media.pikey_male_sounds[20] = trap_S_RegisterSound("sound/newradio/pikey/right.wav", qtrue);
cgs.media.pikey_male_sounds[21] = trap_S_RegisterSound("sound/newradio/pikey/taking_f.wav", qtrue);
cgs.media.pikey_male_sounds[22] = trap_S_RegisterSound("sound/newradio/pikey/teamdown.wav", qtrue);
cgs.media.pikey_male_sounds[23] = trap_S_RegisterSound("sound/newradio/pikey/treport.wav", qtrue);
cgs.media.pikey_male_sounds[24] = trap_S_RegisterSound("sound/newradio/pikey/up.wav", qtrue);
cgs.media.pikey_male_sounds[25] = trap_S_RegisterSound("sound/radio/click.wav", qtrue);
cgs.media.pikey_male_sounds[26] = trap_S_RegisterSound("sound/newradio/pikey/backup1.wav", qtrue);
cgs.media.pikey_male_sounds[27] = trap_S_RegisterSound("sound/newradio/pikey/backup2.wav", qtrue);
cgs.media.pikey_male_sounds[28] = trap_S_RegisterSound("sound/newradio/pikey/backup3.wav", qtrue);
cgs.media.pikey_male_sounds[29] = trap_S_RegisterSound("sound/newradio/pikey/chit1.wav", qtrue);
cgs.media.pikey_male_sounds[30] = trap_S_RegisterSound("sound/newradio/pikey/chit2.wav", qtrue);
cgs.media.pikey_male_sounds[31] = trap_S_RegisterSound("sound/newradio/pikey/chit3.wav", qtrue);
cgs.media.pikey_male_sounds[32] = trap_S_RegisterSound("sound/newradio/pikey/deliv1.wav", qtrue);
cgs.media.pikey_male_sounds[33] = trap_S_RegisterSound("sound/newradio/pikey/deliv2.wav", qtrue);
cgs.media.pikey_male_sounds[34] = trap_S_RegisterSound("sound/newradio/pikey/deliv3.wav", qtrue);
cgs.media.pikey_male_sounds[35] = trap_S_RegisterSound("sound/newradio/pikey/ecdown1.wav", qtrue);
cgs.media.pikey_male_sounds[36] = trap_S_RegisterSound("sound/newradio/pikey/ecdown2.wav", qtrue);
cgs.media.pikey_male_sounds[37] = trap_S_RegisterSound("sound/newradio/pikey/ecdown3.wav", qtrue);
cgs.media.pikey_male_sounds[38] = trap_S_RegisterSound("sound/newradio/pikey/enepak1.wav", qtrue);
cgs.media.pikey_male_sounds[39] = trap_S_RegisterSound("sound/newradio/pikey/enepak2.wav", qtrue);
cgs.media.pikey_male_sounds[40] = trap_S_RegisterSound("sound/newradio/pikey/enepak3.wav", qtrue);
cgs.media.pikey_male_sounds[41] = trap_S_RegisterSound("sound/newradio/pikey/escort1.wav", qtrue);
cgs.media.pikey_male_sounds[42] = trap_S_RegisterSound("sound/newradio/pikey/escort2.wav", qtrue);
cgs.media.pikey_male_sounds[43] = trap_S_RegisterSound("sound/newradio/pikey/escort3.wav", qtrue);
cgs.media.pikey_male_sounds[44] = trap_S_RegisterSound("sound/newradio/pikey/gotpak1.wav", qtrue);
cgs.media.pikey_male_sounds[45] = trap_S_RegisterSound("sound/newradio/pikey/gotpak2.wav", qtrue);
cgs.media.pikey_male_sounds[46] = trap_S_RegisterSound("sound/newradio/pikey/gotpak3.wav", qtrue);
cgs.media.pikey_male_sounds[47] = trap_S_RegisterSound("sound/newradio/pikey/guard1.wav", qtrue);
cgs.media.pikey_male_sounds[48] = trap_S_RegisterSound("sound/newradio/pikey/guard2.wav", qtrue);
cgs.media.pikey_male_sounds[49] = trap_S_RegisterSound("sound/newradio/pikey/guard3.wav", qtrue);
cgs.media.pikey_male_sounds[50] = trap_S_RegisterSound("sound/newradio/pikey/incoming1.wav", qtrue);
cgs.media.pikey_male_sounds[51] = trap_S_RegisterSound("sound/newradio/pikey/incoming2.wav", qtrue);
cgs.media.pikey_male_sounds[52] = trap_S_RegisterSound("sound/newradio/pikey/incoming3.wav", qtrue);
cgs.media.pikey_male_sounds[53] = trap_S_RegisterSound("sound/newradio/pikey/plost1.wav", qtrue);
cgs.media.pikey_male_sounds[54] = trap_S_RegisterSound("sound/newradio/pikey/plost2.wav", qtrue);
cgs.media.pikey_male_sounds[55] = trap_S_RegisterSound("sound/newradio/pikey/plost3.wav", qtrue);
cgs.media.pirate_male_sounds[0] = trap_S_RegisterSound("sound/newradio/pirate/1.wav", qtrue);
cgs.media.pirate_male_sounds[1] = trap_S_RegisterSound("sound/newradio/pirate/2.wav", qtrue);
cgs.media.pirate_male_sounds[2] = trap_S_RegisterSound("sound/newradio/pirate/3.wav", qtrue);
cgs.media.pirate_male_sounds[3] = trap_S_RegisterSound("sound/newradio/pirate/4.wav", qtrue);
cgs.media.pirate_male_sounds[4] = trap_S_RegisterSound("sound/newradio/pirate/5.wav", qtrue);
cgs.media.pirate_male_sounds[5] = trap_S_RegisterSound("sound/newradio/pirate/6.wav", qtrue);
cgs.media.pirate_male_sounds[6] = trap_S_RegisterSound("sound/newradio/pirate/7.wav", qtrue);
cgs.media.pirate_male_sounds[7] = trap_S_RegisterSound("sound/newradio/pirate/8.wav", qtrue);
cgs.media.pirate_male_sounds[8] = trap_S_RegisterSound("sound/newradio/pirate/9.wav", qtrue);
cgs.media.pirate_male_sounds[9] = trap_S_RegisterSound("sound/newradio/pirate/10.wav", qtrue);
cgs.media.pirate_male_sounds[10] = trap_S_RegisterSound("sound/newradio/pirate/back.wav", qtrue);
cgs.media.pirate_male_sounds[11] = trap_S_RegisterSound("sound/newradio/pirate/cover.wav", qtrue);
cgs.media.pirate_male_sounds[12] = trap_S_RegisterSound("sound/newradio/pirate/down.wav", qtrue);
cgs.media.pirate_male_sounds[13] = trap_S_RegisterSound("sound/newradio/pirate/enemyd.wav", qtrue);
cgs.media.pirate_male_sounds[14] = trap_S_RegisterSound("sound/newradio/pirate/enemys.wav", qtrue);
cgs.media.pirate_male_sounds[15] = trap_S_RegisterSound("sound/newradio/pirate/forward.wav", qtrue);
cgs.media.pirate_male_sounds[16] = trap_S_RegisterSound("sound/newradio/pirate/go.wav", qtrue);
cgs.media.pirate_male_sounds[17] = trap_S_RegisterSound("sound/newradio/pirate/im_hit.wav", qtrue);
cgs.media.pirate_male_sounds[18] = trap_S_RegisterSound("sound/newradio/pirate/left.wav", qtrue);
cgs.media.pirate_male_sounds[19] = trap_S_RegisterSound("sound/newradio/pirate/reportin.wav", qtrue);
cgs.media.pirate_male_sounds[20] = trap_S_RegisterSound("sound/newradio/pirate/right.wav", qtrue);
cgs.media.pirate_male_sounds[21] = trap_S_RegisterSound("sound/newradio/pirate/taking_f.wav", qtrue);
cgs.media.pirate_male_sounds[22] = trap_S_RegisterSound("sound/newradio/pirate/teamdown.wav", qtrue);
cgs.media.pirate_male_sounds[23] = trap_S_RegisterSound("sound/newradio/pirate/treport.wav", qtrue);
cgs.media.pirate_male_sounds[24] = trap_S_RegisterSound("sound/newradio/pirate/up.wav", qtrue);
cgs.media.pirate_male_sounds[25] = trap_S_RegisterSound("sound/radio/click.wav", qtrue);
cgs.media.pirate_male_sounds[26] = trap_S_RegisterSound("sound/newradio/pirate/backup1.wav", qtrue);
cgs.media.pirate_male_sounds[27] = trap_S_RegisterSound("sound/newradio/pirate/backup2.wav", qtrue);
cgs.media.pirate_male_sounds[28] = trap_S_RegisterSound("sound/newradio/pirate/backup3.wav", qtrue);
cgs.media.pirate_male_sounds[29] = trap_S_RegisterSound("sound/newradio/pirate/chit1.wav", qtrue);
cgs.media.pirate_male_sounds[30] = trap_S_RegisterSound("sound/newradio/pirate/chit2.wav", qtrue);
cgs.media.pirate_male_sounds[31] = trap_S_RegisterSound("sound/newradio/pirate/chit3.wav", qtrue);
cgs.media.pirate_male_sounds[32] = trap_S_RegisterSound("sound/newradio/pirate/deliv1.wav", qtrue);
cgs.media.pirate_male_sounds[33] = trap_S_RegisterSound("sound/newradio/pirate/deliv2.wav", qtrue);
cgs.media.pirate_male_sounds[34] = trap_S_RegisterSound("sound/newradio/pirate/deliv3.wav", qtrue);
cgs.media.pirate_male_sounds[35] = trap_S_RegisterSound("sound/newradio/pirate/ecdown1.wav", qtrue);
cgs.media.pirate_male_sounds[36] = trap_S_RegisterSound("sound/newradio/pirate/ecdown2.wav", qtrue);
cgs.media.pirate_male_sounds[37] = trap_S_RegisterSound("sound/newradio/pirate/ecdown3.wav", qtrue);
cgs.media.pirate_male_sounds[38] = trap_S_RegisterSound("sound/newradio/pirate/enepak1.wav", qtrue);
cgs.media.pirate_male_sounds[39] = trap_S_RegisterSound("sound/newradio/pirate/enepak2.wav", qtrue);
cgs.media.pirate_male_sounds[40] = trap_S_RegisterSound("sound/newradio/pirate/enepak3.wav", qtrue);
cgs.media.pirate_male_sounds[41] = trap_S_RegisterSound("sound/newradio/pirate/escort1.wav", qtrue);
cgs.media.pirate_male_sounds[42] = trap_S_RegisterSound("sound/newradio/pirate/escort2.wav", qtrue);
cgs.media.pirate_male_sounds[43] = trap_S_RegisterSound("sound/newradio/pirate/escort3.wav", qtrue);
cgs.media.pirate_male_sounds[44] = trap_S_RegisterSound("sound/newradio/pirate/gotpak1.wav", qtrue);
cgs.media.pirate_male_sounds[45] = trap_S_RegisterSound("sound/newradio/pirate/gotpak2.wav", qtrue);
cgs.media.pirate_male_sounds[46] = trap_S_RegisterSound("sound/newradio/pirate/gotpak3.wav", qtrue);
cgs.media.pirate_male_sounds[47] = trap_S_RegisterSound("sound/newradio/pirate/guard1.wav", qtrue);
cgs.media.pirate_male_sounds[48] = trap_S_RegisterSound("sound/newradio/pirate/guard2.wav", qtrue);
cgs.media.pirate_male_sounds[49] = trap_S_RegisterSound("sound/newradio/pirate/guard3.wav", qtrue);
cgs.media.pirate_male_sounds[50] = trap_S_RegisterSound("sound/newradio/pirate/incoming1.wav", qtrue);
cgs.media.pirate_male_sounds[51] = trap_S_RegisterSound("sound/newradio/pirate/incoming2.wav", qtrue);
cgs.media.pirate_male_sounds[52] = trap_S_RegisterSound("sound/newradio/pirate/incoming3.wav", qtrue);
cgs.media.pirate_male_sounds[53] = trap_S_RegisterSound("sound/newradio/pirate/plost1.wav", qtrue);
cgs.media.pirate_male_sounds[54] = trap_S_RegisterSound("sound/newradio/pirate/plost2.wav", qtrue);
cgs.media.pirate_male_sounds[55] = trap_S_RegisterSound("sound/newradio/pirate/plost3.wav", qtrue);
cgs.media.female_sounds[0] = trap_S_RegisterSound("sound/radio/female/1.wav", qtrue);
cgs.media.female_sounds[1] = trap_S_RegisterSound("sound/radio/female/2.wav", qtrue);
cgs.media.female_sounds[2] = trap_S_RegisterSound("sound/radio/female/3.wav", qtrue);

7
reaction/cgame/cg_scoreboard.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.42 2002/07/19 04:40:56 jbravo
// Added 2 new radio sets and ctb radio sound support
//
// Revision 1.41 2002/07/09 05:42:51 niceass
// flag scoreboard changes
//
@ -1312,9 +1315,9 @@ void CG_DrawWeaponStats(void)
void CG_ScoreBoardHead(team_t team, float x, float y, float w, float h) {
char modelskin[128], filename[128];
char *model = NULL, *skin = NULL;
qhandle_t headModel, headSkin, headIcon;
qhandle_t headIcon; //headModel, headSkin;
vec3_t Angles;
//vec3_t Angles;
if (team == TEAM_RED)
strcpy(modelskin, cg_RQ3_team1model.string);

22
reaction/cgame/cg_servercmds.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.57 2002/07/19 04:40:56 jbravo
// Added 2 new radio sets and ctb radio sound support
//
// Revision 1.56 2002/07/08 04:28:55 niceass
// removed deaths
//
@ -1098,12 +1101,23 @@ void CG_Radio(void)
gender = atoi(CG_Argv(3));
//Slicer optimization
if (!gender) {
if (cg_RQ3_newradio_male.integer)
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]);
} else if (cg_RQ3_radiovoice_male.integer == 1) {
CG_AddBufferedSound(cgs.media.new_male_sounds[sound]);
} else if (cg_RQ3_radiovoice_male.integer == 2) {
CG_AddBufferedSound(cgs.media.pikey_male_sounds[sound]);
} else if (cg_RQ3_radiovoice_male.integer > 2) {
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.male_sounds[sound]);
} else {
CG_AddBufferedSound(cgs.media.female_sounds[sound]);
CG_AddBufferedSound(cgs.media.female_sounds[sound]);
}
return;
}

68
reaction/game/g_teamplay.c
View file

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.124 2002/07/19 04:40:56 jbravo
// Added 2 new radio sets and ctb radio sound support
//
// Revision 1.123 2002/07/11 04:27:29 niceass
// crash bug fix for CTB & not selecting an item
//
@ -1356,6 +1359,37 @@ radio_msg_t male_radio_msgs[] = {
{"treport", 12},
{"up", 4},
{"click", 4},
// JBravo: CTB sounds
{"backup1", 1},
{"backup2", 1},
{"backup3", 1},
{"chit1", 1},
{"chit2", 1},
{"chit3", 1},
{"deliv1", 1},
{"deliv2", 1},
{"deliv3", 1},
{"ecdown1", 1},
{"ecdown2", 1},
{"ecdown3", 1},
{"enepak1", 1},
{"enepak2", 1},
{"enepak3", 1},
{"escort1", 1},
{"escort2", 1},
{"escort3", 1},
{"gotpak1", 1},
{"gotpak2", 1},
{"gotpak3", 1},
{"guard1", 1},
{"guard2", 1},
{"guard3", 1},
{"incoming1", 1},
{"incoming2", 1},
{"incoming3", 1},
{"plost1", 1},
{"plost2", 1},
{"plost3", 1},
{"END", 0}, // end of list delimiter
};
@ -1386,6 +1420,37 @@ radio_msg_t female_radio_msgs[] = {
{"treport", 12},
{"up", 6},
{"click", 6},
// JBravo: CTB sounds
{"backup1", 1},
{"backup2", 1},
{"backup3", 1},
{"chit1", 1},
{"chit2", 1},
{"chit3", 1},
{"deliv1", 1},
{"deliv2", 1},
{"deliv3", 1},
{"ecdown1", 1},
{"ecdown2", 1},
{"ecdown3", 1},
{"enepak1", 1},
{"enepak2", 1},
{"enepak3", 1},
{"escort1", 1},
{"escort2", 1},
{"escort3", 1},
{"gotpak1", 1},
{"gotpak2", 1},
{"gotpak3", 1},
{"guard1", 1},
{"guard2", 1},
{"guard3", 1},
{"incoming1", 1},
{"incoming2", 1},
{"incoming3", 1},
{"plost1", 1},
{"plost2", 1},
{"plost3", 1},
{"END", 0}, // end of list delimiter
};
@ -1546,6 +1611,9 @@ void RQ3_Cmd_Radio_f(gentity_t * ent)
return;
}
x++;
// JBravo: no CTB sounds unless CTB mode is on.
if (g_gametype.integer != GT_CTF && x > 25)
return;
}
}