rq3
/
reaction
mirror of https://github.com/ReactionQuake3/reaction.git
0
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tkok popup system

This commit is contained in:
Richard Allen 2002-05-19 21:04:37 +00:00
parent 6c08ccc4aa
commit 58f3e4c5fa
5 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
reaction/cgame/cg_local.h
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.78 2002/05/19 21:04:37 jbravo
// Tkok popup system
//
// Revision 1.77 2002/05/19 18:32:11 jbravo
// Made new cvars for regular xhair colors.
//
@ -1606,6 +1609,8 @@ extern vmCvar_t cg_RQ3_crosshairColorR;
extern vmCvar_t cg_RQ3_crosshairColorG;
extern vmCvar_t cg_RQ3_crosshairColorB;
extern vmCvar_t cg_RQ3_crosshairColorA;
// JBravo: cvar for tkok popups
extern vmCvar_t cg_RQ3_tkokAutoPopup;
//Elder: SSG unique sensitivities
extern vmCvar_t cg_RQ3_ssgSensitivityAuto;
extern vmCvar_t cg_RQ3_ssgSensitivity2x;

6
reaction/cgame/cg_main.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.67 2002/05/19 21:04:37 jbravo
// Tkok popup system
//
// Revision 1.66 2002/05/19 18:32:11 jbravo
// Made new cvars for regular xhair colors.
//
@ -273,6 +276,8 @@ vmCvar_t cg_RQ3_crosshairColorR;
vmCvar_t cg_RQ3_crosshairColorG;
vmCvar_t cg_RQ3_crosshairColorB;
vmCvar_t cg_RQ3_crosshairColorA;
// JBravo: cvar for tkok popup
vmCvar_t cg_RQ3_tkokAutoPopup;
//Elder: SSG unique sensitivities
vmCvar_t cg_RQ3_ssgSensitivityAuto;
vmCvar_t cg_RQ3_ssgSensitivity2x;
@ -497,6 +502,7 @@ static cvarTable_t cvarTable[] = { // bk001129
{ &cg_RQ3_crosshairColorG, "cg_RQ3_crosshairColorG", "1.0", CVAR_ARCHIVE },
{ &cg_RQ3_crosshairColorB, "cg_RQ3_crosshairColorB", "0.0", CVAR_ARCHIVE },
{ &cg_RQ3_crosshairColorA, "cg_RQ3_crosshairColorA", "0.75", CVAR_ARCHIVE },
{ &cg_RQ3_tkokAutoPopup, "cg_RQ3_tkokAutoPopup", "0", 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 },

7
reaction/cgame/cg_servercmds.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.38 2002/05/19 21:04:37 jbravo
// Tkok popup system
//
// Revision 1.37 2002/05/18 21:58:53 blaze
// cg_rq3_autoaction support
//
@ -1350,6 +1353,10 @@ void CG_RQ3_Cmd () {
case RADIO:
CG_Radio();
break;
case TKOK:
if (cg_RQ3_tkokAutoPopup.integer)
trap_SendConsoleCommand ("ui_RQ3_tkok\n");
break;
default:
break;
}

8
reaction/game/bg_public.h
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.66 2002/05/19 21:04:37 jbravo
// Tkok popup system
//
// Revision 1.65 2002/05/18 21:57:54 blaze
// Transmit round start to clients
// used for cg_rq3_autoaction
@ -268,9 +271,10 @@ enum {
SELECTPISTOL,
ROUND,
MAPEND,
MAPSTART,
SETWEAPON,
MAPSTART,
SETWEAPON,
STUFF,
TKOK,
RADIO
};
//Elder: sound events for EV_RQ3_SOUND

4
reaction/game/g_combat.c
View File

@ -5,6 +5,9 @@
//-----------------------------------------------------------------------------
//
// $Log$
// Revision 1.79 2002/05/19 21:04:37 jbravo
// Tkok popup system
//
// Revision 1.78 2002/05/19 04:48:50 jbravo
// Added sniper headshot and hc really hard hit gibbing. HC event gets lost
// between game and cgame
@ -1319,6 +1322,7 @@ void player_die( gentity_t *self, gentity_t *inflictor, gentity_t *attacker, int
//Also, increment the TK's record
attacker->client->pers.records[REC_TEAMKILLS]++;
Add_TeamKill(attacker);
trap_SendServerCommand (self-g_entities, va("rq3_cmd %i %s", TKOK, attacker->client->pers.netname));
}
} else {
// Increase number of kills this life for attacker