rq3/reaction
0
0
Fork 0
mirror of https://github.com/ReactionQuake3/reaction.git synced 2025-02-17 01:22:32 +00:00
Code Issues Projects Releases Packages Wiki Activity

New radio sounds and the 0wned sound was added.

Browse source
This commit is contained in:
Richard Allen 2002-06-30 17:33:01 +00:00
parent 4e41df2d7e
commit 72ab15701d
6 changed files with 65 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
reaction/cgame/cg_local.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.103 2002/06/30 17:33:01 jbravo
// New radio sounds and the 0wned sound was added.
//
// Revision 1.102 2002/06/24 05:55:24 niceass // Revision 1.102 2002/06/24 05:55:24 niceass
// drawping // drawping
// //
@ -1345,6 +1348,7 @@ typedef struct {
//Slicer //Slicer
sfxHandle_t male_sounds[26]; sfxHandle_t male_sounds[26];
sfxHandle_t new_male_sounds[26];
sfxHandle_t female_sounds[26]; sfxHandle_t female_sounds[26];
sfxHandle_t steamSound; sfxHandle_t steamSound;
@ -1601,6 +1605,8 @@ extern vmCvar_t cg_RQ3_overlaycrosshair;
// JBravo: cvar for tkok popups // JBravo: cvar for tkok popups
extern vmCvar_t cg_RQ3_tkokAutoPopup; extern vmCvar_t cg_RQ3_tkokAutoPopup;
extern vmCvar_t cg_RQ3_newradio_male;
extern vmCvar_t cg_RQ3_newradio_female;
// Slicer: for the Anti-Cheat System // Slicer: for the Anti-Cheat System
//extern vmCvar_t cg_RQ3_Auth; //extern vmCvar_t cg_RQ3_Auth;

33
reaction/cgame/cg_main.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.91 2002/06/30 17:33:01 jbravo
// New radio sounds and the 0wned sound was added.
//
// Revision 1.90 2002/06/29 04:15:15 jbravo // Revision 1.90 2002/06/29 04:15:15 jbravo
// CTF is now CTB. no weapons while the case is in hand other than pistol or knife // CTF is now CTB. no weapons while the case is in hand other than pistol or knife
// //
@ -347,6 +350,8 @@ vmCvar_t cg_RQ3_overlaycrosshair;
// JBravo: cvar for tkok popup // JBravo: cvar for tkok popup
vmCvar_t cg_RQ3_tkokAutoPopup; vmCvar_t cg_RQ3_tkokAutoPopup;
vmCvar_t cg_RQ3_newradio_male;
vmCvar_t cg_RQ3_newradio_female;
// Slicer: for the Anti-Cheat System // Slicer: for the Anti-Cheat System
//vmCvar_t cg_RQ3_Auth; //vmCvar_t cg_RQ3_Auth;
@ -576,6 +581,8 @@ static cvarTable_t cvarTable[] = { // bk001129
{&cg_RQ3_crosshairColorB, "cg_RQ3_crosshairColorB", "1.0", CVAR_ARCHIVE}, {&cg_RQ3_crosshairColorB, "cg_RQ3_crosshairColorB", "1.0", CVAR_ARCHIVE},
{&cg_RQ3_crosshairColorA, "cg_RQ3_crosshairColorA", "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_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_impactEffects, "cg_RQ3_impactEffects", "1", CVAR_ARCHIVE}, {&cg_RQ3_impactEffects, "cg_RQ3_impactEffects", "1", CVAR_ARCHIVE},
{&cg_RQ3_laserAssist, "cg_RQ3_laserAssist", "0", CVAR_ARCHIVE}, {&cg_RQ3_laserAssist, "cg_RQ3_laserAssist", "0", CVAR_ARCHIVE},
{&cg_RQ3_anouncer, "cg_RQ3_announcer", "1", CVAR_ARCHIVE}, {&cg_RQ3_anouncer, "cg_RQ3_announcer", "1", CVAR_ARCHIVE},
@ -885,6 +892,32 @@ static void CG_RegisterSounds(void)
cgs.media.male_sounds[23] = trap_S_RegisterSound("sound/radio/male/treport.wav", qtrue); 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[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[25] = trap_S_RegisterSound("sound/radio/click.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);
cgs.media.new_male_sounds[3] = trap_S_RegisterSound("sound/newradio/male/4.wav", qtrue);
cgs.media.new_male_sounds[4] = trap_S_RegisterSound("sound/newradio/male/5.wav", qtrue);
cgs.media.new_male_sounds[5] = trap_S_RegisterSound("sound/newradio/male/6.wav", qtrue);
cgs.media.new_male_sounds[6] = trap_S_RegisterSound("sound/newradio/male/7.wav", qtrue);
cgs.media.new_male_sounds[7] = trap_S_RegisterSound("sound/newradio/male/8.wav", qtrue);
cgs.media.new_male_sounds[8] = trap_S_RegisterSound("sound/newradio/male/9.wav", qtrue);
cgs.media.new_male_sounds[9] = trap_S_RegisterSound("sound/newradio/male/10.wav", qtrue);
cgs.media.new_male_sounds[10] = trap_S_RegisterSound("sound/newradio/male/back.wav", qtrue);
cgs.media.new_male_sounds[11] = trap_S_RegisterSound("sound/newradio/male/cover.wav", qtrue);
cgs.media.new_male_sounds[12] = trap_S_RegisterSound("sound/newradio/male/down.wav", qtrue);
cgs.media.new_male_sounds[13] = trap_S_RegisterSound("sound/newradio/male/enemyd.wav", qtrue);
cgs.media.new_male_sounds[14] = trap_S_RegisterSound("sound/newradio/male/enemys.wav", qtrue);
cgs.media.new_male_sounds[15] = trap_S_RegisterSound("sound/newradio/male/forward.wav", qtrue);
cgs.media.new_male_sounds[16] = trap_S_RegisterSound("sound/newradio/male/go.wav", qtrue);
cgs.media.new_male_sounds[17] = trap_S_RegisterSound("sound/newradio/male/im_hit.wav", qtrue);
cgs.media.new_male_sounds[18] = trap_S_RegisterSound("sound/newradio/male/left.wav", qtrue);
cgs.media.new_male_sounds[19] = trap_S_RegisterSound("sound/newradio/male/reportin.wav", qtrue);
cgs.media.new_male_sounds[20] = trap_S_RegisterSound("sound/newradio/male/right.wav", qtrue);
cgs.media.new_male_sounds[21] = trap_S_RegisterSound("sound/newradio/male/taking_f.wav", qtrue);
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.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);

11
reaction/cgame/cg_servercmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.53 2002/06/30 17:33:01 jbravo
// New radio sounds and the 0wned sound was added.
//
// Revision 1.52 2002/06/16 20:06:13 jbravo // Revision 1.52 2002/06/16 20:06:13 jbravo
// Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap" // Reindented all the source files with "indent -kr -ut -i8 -l120 -lc120 -sob -bad -bap"
// //
@ -1087,7 +1090,10 @@ void CG_Radio(void)
gender = atoi(CG_Argv(3)); gender = atoi(CG_Argv(3));
//Slicer optimization //Slicer optimization
if (!gender) { if (!gender) {
CG_AddBufferedSound(cgs.media.male_sounds[sound]); if (cg_RQ3_newradio_male.integer)
CG_AddBufferedSound(cgs.media.new_male_sounds[sound]);
else
CG_AddBufferedSound(cgs.media.male_sounds[sound]);
} else { } else {
CG_AddBufferedSound(cgs.media.female_sounds[sound]); CG_AddBufferedSound(cgs.media.female_sounds[sound]);
} }
@ -1270,6 +1276,9 @@ void CG_RQ3_Cmd()
if (cg_RQ3_tkokAutoPopup.integer) if (cg_RQ3_tkokAutoPopup.integer)
trap_SendConsoleCommand("ui_RQ3_tkok\n"); trap_SendConsoleCommand("ui_RQ3_tkok\n");
break; break;
case OWNED:
if (cg_RQ3_anouncer.integer == 1)
CG_AddBufferedSound(cgs.media.humiliationSound);
default: default:
break; break;
} }

6
reaction/game/bg_public.h
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.83 2002/06/30 17:33:01 jbravo
// New radio sounds and the 0wned sound was added.
//
// Revision 1.82 2002/06/21 21:03:15 niceass // Revision 1.82 2002/06/21 21:03:15 niceass
// quicker ssg after reload // quicker ssg after reload
// //
@ -327,7 +330,8 @@ enum {
RADIO, RADIO,
STARTDEMO, STARTDEMO,
STOPDEMO, STOPDEMO,
SCREENSHOT SCREENSHOT,
OWNED
}; };
//Elder: sound events for EV_RQ3_SOUND //Elder: sound events for EV_RQ3_SOUND

4
reaction/game/g_client.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.103 2002/06/30 17:33:01 jbravo
// New radio sounds and the 0wned sound was added.
//
// Revision 1.102 2002/06/26 15:58:13 makro // Revision 1.102 2002/06/26 15:58:13 makro
// Fixed a crash bug in the spawning code // Fixed a crash bug in the spawning code
// (happenned on maps with one spawn point) // (happenned on maps with one spawn point)
@ -1492,6 +1495,7 @@ void ClientBegin(int clientNum)
for (i = 0; i < MAX_PERSISTANT; i++) for (i = 0; i < MAX_PERSISTANT; i++)
client->ps.persistant[i] = savedPers[i]; client->ps.persistant[i] = savedPers[i];
} }
// locate ent at a spawn point // locate ent at a spawn point
ClientSpawn(ent); ClientSpawn(ent);

7
reaction/game/g_combat.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.106 2002/06/30 17:33:01 jbravo
// New radio sounds and the 0wned sound was added.
//
// Revision 1.105 2002/06/29 20:57:25 niceass // Revision 1.105 2002/06/29 20:57:25 niceass
// small change to kevlar detection // small change to kevlar detection
// //
@ -1342,6 +1345,10 @@ void player_die(gentity_t * self, gentity_t * inflictor, gentity_t * attacker, i
DMReward->r.svFlags = SVF_BROADCAST; DMReward->r.svFlags = SVF_BROADCAST;
} }
} }
// JBravo: adding the 0wned sound
if (meansOfDeath == MOD_KNIFE) {
trap_SendServerCommand(-1, va("rq3_cmd %i", OWNED));
}
attacker->client->lastKillTime = level.time; attacker->client->lastKillTime = level.time;
} }
} else { } else {