rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2024-11-29 15:31:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Added the Keanu male radio sound set.

Browse source
This commit is contained in:
Richard Allen 2002-08-28 18:52:10 +00:00
parent 4f66e3c57b
commit 649e9a9281
5 changed files with 76 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
reaction/ChangeLog
View file

@ -57,7 +57,7 @@
* Added ref say command to talk to everyone, dead or alive * Added ref say command to talk to everyone, dead or alive
* Players can now use the kill cmd, plummet and kill teammates after rounds in tp without loosing frags. * Players can now use the kill cmd, plummet and kill teammates after rounds in tp without loosing frags.
* Fixed message for players wearing a kevlar vest and get hiot by weapons other than the SSG * Fixed message for players wearing a kevlar vest and get hiot by weapons other than the SSG
* Added the Keanu male radio soundset.
# List fixes here for the 2.1 release # List fixes here for the 2.1 release

4
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.121 2002/08/28 18:52:09 jbravo
// Added the Keanu male radio sound set.
//
// Revision 1.120 2002/08/27 05:10:42 niceass // Revision 1.120 2002/08/27 05:10:42 niceass
// new ctb marker shader names // new ctb marker shader names
// //
@ -1417,6 +1420,7 @@ typedef struct {
sfxHandle_t new_male_sounds[56]; sfxHandle_t new_male_sounds[56];
sfxHandle_t pikey_male_sounds[56]; sfxHandle_t pikey_male_sounds[56];
sfxHandle_t pirate_male_sounds[56]; sfxHandle_t pirate_male_sounds[56];
sfxHandle_t keanu_male_sounds[56];
sfxHandle_t female_sounds[56]; sfxHandle_t female_sounds[56];
sfxHandle_t steamSound; sfxHandle_t steamSound;

60
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.105 2002/08/28 18:52:09 jbravo
// Added the Keanu male radio sound set.
//
// Revision 1.104 2002/08/27 05:10:05 niceass // Revision 1.104 2002/08/27 05:10:05 niceass
// new ctb marker shader names // new ctb marker shader names
// //
@ -1194,6 +1197,63 @@ static void CG_RegisterSounds(void)
cgs.media.pirate_male_sounds[53] = trap_S_RegisterSound("sound/newradio/pirate/plost1.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[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.pirate_male_sounds[55] = trap_S_RegisterSound("sound/newradio/pirate/plost3.wav", qtrue);
cgs.media.keanu_male_sounds[0] = trap_S_RegisterSound("sound/newradio/keanu/1.wav", qtrue);
cgs.media.keanu_male_sounds[1] = trap_S_RegisterSound("sound/newradio/keanu/2.wav", qtrue);
cgs.media.keanu_male_sounds[2] = trap_S_RegisterSound("sound/newradio/keanu/3.wav", qtrue);
cgs.media.keanu_male_sounds[3] = trap_S_RegisterSound("sound/newradio/keanu/4.wav", qtrue);
cgs.media.keanu_male_sounds[4] = trap_S_RegisterSound("sound/newradio/keanu/5.wav", qtrue);
cgs.media.keanu_male_sounds[5] = trap_S_RegisterSound("sound/newradio/keanu/6.wav", qtrue);
cgs.media.keanu_male_sounds[6] = trap_S_RegisterSound("sound/newradio/keanu/7.wav", qtrue);
cgs.media.keanu_male_sounds[7] = trap_S_RegisterSound("sound/newradio/keanu/8.wav", qtrue);
cgs.media.keanu_male_sounds[8] = trap_S_RegisterSound("sound/newradio/keanu/9.wav", qtrue);
cgs.media.keanu_male_sounds[9] = trap_S_RegisterSound("sound/newradio/keanu/10.wav", qtrue);
cgs.media.keanu_male_sounds[10] = trap_S_RegisterSound("sound/newradio/keanu/back.wav", qtrue);
cgs.media.keanu_male_sounds[11] = trap_S_RegisterSound("sound/newradio/keanu/cover.wav", qtrue);
cgs.media.keanu_male_sounds[12] = trap_S_RegisterSound("sound/newradio/keanu/down.wav", qtrue);
cgs.media.keanu_male_sounds[13] = trap_S_RegisterSound("sound/newradio/keanu/enemyd.wav", qtrue);
cgs.media.keanu_male_sounds[14] = trap_S_RegisterSound("sound/newradio/keanu/enemys.wav", qtrue);
cgs.media.keanu_male_sounds[15] = trap_S_RegisterSound("sound/newradio/keanu/forward.wav", qtrue);
cgs.media.keanu_male_sounds[16] = trap_S_RegisterSound("sound/newradio/keanu/go.wav", qtrue);
cgs.media.keanu_male_sounds[17] = trap_S_RegisterSound("sound/newradio/keanu/im_hit.wav", qtrue);
cgs.media.keanu_male_sounds[18] = trap_S_RegisterSound("sound/newradio/keanu/left.wav", qtrue);
cgs.media.keanu_male_sounds[19] = trap_S_RegisterSound("sound/newradio/keanu/reportin.wav", qtrue);
cgs.media.keanu_male_sounds[20] = trap_S_RegisterSound("sound/newradio/keanu/right.wav", qtrue);
cgs.media.keanu_male_sounds[21] = trap_S_RegisterSound("sound/newradio/keanu/taking_f.wav", qtrue);
cgs.media.keanu_male_sounds[22] = trap_S_RegisterSound("sound/newradio/keanu/teamdown.wav", qtrue);
cgs.media.keanu_male_sounds[23] = trap_S_RegisterSound("sound/newradio/keanu/treport.wav", qtrue);
cgs.media.keanu_male_sounds[24] = trap_S_RegisterSound("sound/newradio/keanu/up.wav", qtrue);
cgs.media.keanu_male_sounds[25] = trap_S_RegisterSound("sound/radio/click.wav", qtrue);
cgs.media.keanu_male_sounds[26] = trap_S_RegisterSound("sound/newradio/keanu/backup1.wav", qtrue);
cgs.media.keanu_male_sounds[27] = trap_S_RegisterSound("sound/newradio/keanu/backup2.wav", qtrue);
cgs.media.keanu_male_sounds[28] = trap_S_RegisterSound("sound/newradio/keanu/backup3.wav", qtrue);
cgs.media.keanu_male_sounds[29] = trap_S_RegisterSound("sound/newradio/keanu/chit1.wav", qtrue);
cgs.media.keanu_male_sounds[30] = trap_S_RegisterSound("sound/newradio/keanu/chit2.wav", qtrue);
cgs.media.keanu_male_sounds[31] = trap_S_RegisterSound("sound/newradio/keanu/chit3.wav", qtrue);
cgs.media.keanu_male_sounds[32] = trap_S_RegisterSound("sound/newradio/keanu/deliv1.wav", qtrue);
cgs.media.keanu_male_sounds[33] = trap_S_RegisterSound("sound/newradio/keanu/deliv2.wav", qtrue);
cgs.media.keanu_male_sounds[34] = trap_S_RegisterSound("sound/newradio/keanu/deliv3.wav", qtrue);
cgs.media.keanu_male_sounds[35] = trap_S_RegisterSound("sound/newradio/keanu/ecdown1.wav", qtrue);
cgs.media.keanu_male_sounds[36] = trap_S_RegisterSound("sound/newradio/keanu/ecdown2.wav", qtrue);
cgs.media.keanu_male_sounds[37] = trap_S_RegisterSound("sound/newradio/keanu/ecdown3.wav", qtrue);
cgs.media.keanu_male_sounds[38] = trap_S_RegisterSound("sound/newradio/keanu/enepak1.wav", qtrue);
cgs.media.keanu_male_sounds[39] = trap_S_RegisterSound("sound/newradio/keanu/enepak2.wav", qtrue);
cgs.media.keanu_male_sounds[40] = trap_S_RegisterSound("sound/newradio/keanu/enepak3.wav", qtrue);
cgs.media.keanu_male_sounds[41] = trap_S_RegisterSound("sound/newradio/keanu/escort1.wav", qtrue);
cgs.media.keanu_male_sounds[42] = trap_S_RegisterSound("sound/newradio/keanu/escort2.wav", qtrue);
cgs.media.keanu_male_sounds[43] = trap_S_RegisterSound("sound/newradio/keanu/escort3.wav", qtrue);
cgs.media.keanu_male_sounds[44] = trap_S_RegisterSound("sound/newradio/keanu/gotpak1.wav", qtrue);
cgs.media.keanu_male_sounds[45] = trap_S_RegisterSound("sound/newradio/keanu/gotpak2.wav", qtrue);
cgs.media.keanu_male_sounds[46] = trap_S_RegisterSound("sound/newradio/keanu/gotpak3.wav", qtrue);
cgs.media.keanu_male_sounds[47] = trap_S_RegisterSound("sound/newradio/keanu/guard1.wav", qtrue);
cgs.media.keanu_male_sounds[48] = trap_S_RegisterSound("sound/newradio/keanu/guard2.wav", qtrue);
cgs.media.keanu_male_sounds[49] = trap_S_RegisterSound("sound/newradio/keanu/guard3.wav", qtrue);
cgs.media.keanu_male_sounds[50] = trap_S_RegisterSound("sound/newradio/keanu/incoming1.wav", qtrue);
cgs.media.keanu_male_sounds[51] = trap_S_RegisterSound("sound/newradio/keanu/incoming2.wav", qtrue);
cgs.media.keanu_male_sounds[52] = trap_S_RegisterSound("sound/newradio/keanu/incoming3.wav", qtrue);
cgs.media.keanu_male_sounds[53] = trap_S_RegisterSound("sound/newradio/keanu/plost1.wav", qtrue);
cgs.media.keanu_male_sounds[54] = trap_S_RegisterSound("sound/newradio/keanu/plost2.wav", qtrue);
cgs.media.keanu_male_sounds[55] = trap_S_RegisterSound("sound/newradio/keanu/plost3.wav", qtrue);
cgs.media.female_sounds[0] = trap_S_RegisterSound("sound/radio/female/1.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[1] = trap_S_RegisterSound("sound/radio/female/2.wav", qtrue);
cgs.media.female_sounds[2] = trap_S_RegisterSound("sound/radio/female/3.wav", qtrue); cgs.media.female_sounds[2] = trap_S_RegisterSound("sound/radio/female/3.wav", qtrue);

13
reaction/cgame/cg_servercmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.65 2002/08/28 18:52:09 jbravo
// Added the Keanu male radio sound set.
//
// Revision 1.64 2002/08/25 00:45:04 niceass // Revision 1.64 2002/08/25 00:45:04 niceass
// q3f atmosphere // q3f atmosphere
// //
@ -1148,9 +1151,10 @@ void CG_Radio(void)
CG_AddBufferedSound(cgs.media.new_male_sounds[sound]); CG_AddBufferedSound(cgs.media.new_male_sounds[sound]);
} else if (set == 2) { } else if (set == 2) {
CG_AddBufferedSound(cgs.media.pikey_male_sounds[sound]); CG_AddBufferedSound(cgs.media.pikey_male_sounds[sound]);
} else if (set > 2) { } else if (set == 3) {
CG_AddBufferedSound(cgs.media.pirate_male_sounds[sound]); CG_AddBufferedSound(cgs.media.pirate_male_sounds[sound]);
} } else if (set > 3)
CG_AddBufferedSound(cgs.media.keanu_male_sounds[sound]);
} else } else
CG_AddBufferedSound(cgs.media.female_sounds[sound]); CG_AddBufferedSound(cgs.media.female_sounds[sound]);
} else if (!gender) { } else if (!gender) {
@ -1160,9 +1164,10 @@ void CG_Radio(void)
CG_AddBufferedSound(cgs.media.new_male_sounds[sound]); CG_AddBufferedSound(cgs.media.new_male_sounds[sound]);
} else if (cg_RQ3_radiovoice_male.integer == 2) { } else if (cg_RQ3_radiovoice_male.integer == 2) {
CG_AddBufferedSound(cgs.media.pikey_male_sounds[sound]); CG_AddBufferedSound(cgs.media.pikey_male_sounds[sound]);
} else if (cg_RQ3_radiovoice_male.integer > 2) { } else if (cg_RQ3_radiovoice_male.integer == 3) {
CG_AddBufferedSound(cgs.media.pirate_male_sounds[sound]);
} else if (cg_RQ3_radiovoice_male.integer > 3)
CG_AddBufferedSound(cgs.media.pirate_male_sounds[sound]); CG_AddBufferedSound(cgs.media.pirate_male_sounds[sound]);
}
} else { } else {
CG_AddBufferedSound(cgs.media.female_sounds[sound]); CG_AddBufferedSound(cgs.media.female_sounds[sound]);
} }

4
reaction/uifiles/ingame_player.menu
View file

@ -179,12 +179,12 @@
rect 138 122 160 16 rect 138 122 160 16
style WINDOW_STYLE_FILLED style WINDOW_STYLE_FILLED
type ITEM_TYPE_MULTI type ITEM_TYPE_MULTI
text "M. Male Radioset:" text "M. Male Radio voice:"
shortcutKey "M" shortcutKey "M"
border 1 border 1
bordersize 1 bordersize 1
cvar "cg_RQ3_radiovoice_male" cvar "cg_RQ3_radiovoice_male"
cvarFloatList { "New" 1 "Pikey" 2 "Pirate" 3 "Original" 0 } cvarFloatList { "New" 1 "Pikey" 2 "Pirate" 3 "Keanu" 4 "Original" 0 }
textstyle ITEM_TEXTSTYLE_NORMAL textstyle ITEM_TEXTSTYLE_NORMAL
textalign ITEM_ALIGN_LEFT textalign ITEM_ALIGN_LEFT
textalignx 6 textalignx 6