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

Fixed shots fired stats for non TP modes and some cleanups

Browse source
This commit is contained in:
Richard Allen 2002-06-23 21:44:08 +00:00
parent a98b607da2
commit d20dc0a0fb
4 changed files with 21 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
reaction/cgame/cg_draw.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.50 2002/06/23 21:44:07 jbravo
// Fixed shots fired stats for non TP modes and some cleanups
//
// Revision 1.49 2002/06/21 23:20:34 blaze // Revision 1.49 2002/06/21 23:20:34 blaze
// cg_rq3_overlaycrosshair when set to 1 will draw your non zoomed crosshair overtop of your ssg crosshair // cg_rq3_overlaycrosshair when set to 1 will draw your non zoomed crosshair overtop of your ssg crosshair
// //
@ -1610,7 +1613,7 @@ static void CG_DrawCrosshair(void)
// return; // return;
//} //}
//Slicer: Adding Crosshair to FOLLOW SPECS //Slicer: Adding Crosshair to FOLLOW SPECS
drawSSG = 0; drawSSG = 0;
if (cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR && !(cg.snap->ps.pm_flags & PMF_FOLLOW)) { if (cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR && !(cg.snap->ps.pm_flags & PMF_FOLLOW)) {
return; return;
} }
@ -1684,15 +1687,14 @@ static void CG_DrawCrosshair(void)
CG_DrawPic(x - 128, y - 128, 256, 256, cgs.media.ssgCrosshair[zoomMag]); CG_DrawPic(x - 128, y - 128, 256, 256, cgs.media.ssgCrosshair[zoomMag]);
trap_R_SetColor(NULL); trap_R_SetColor(NULL);
drawSSG = 1; drawSSG = 1;
} }
} }
//Slicer if no crosshair, and not using SSG, dont draw crosshair //Slicer if no crosshair, and not using SSG, dont draw crosshair
if(!cg_drawCrosshair.integer) if(!cg_drawCrosshair.integer)
return; return;
if (drawSSG == 0 || drawSSG == 1 && cg_RQ3_overlaycrosshair.integer == 1) if (drawSSG == 0 || (drawSSG == 1 && cg_RQ3_overlaycrosshair.integer == 1)) {
{
x = cg_crosshairX.integer; x = cg_crosshairX.integer;
y = cg_crosshairY.integer; y = cg_crosshairY.integer;
CG_AdjustFrom640(&x, &y, &w, &h); CG_AdjustFrom640(&x, &y, &w, &h);
@ -1702,7 +1704,7 @@ static void CG_DrawCrosshair(void)
ca = 0; ca = 0;
} }
hShader = cgs.media.crosshairShader[ca % NUM_CROSSHAIRS]; hShader = cgs.media.crosshairShader[ca % NUM_CROSSHAIRS];
//}
crosshairColor[0] = cg_RQ3_crosshairColorR.value; crosshairColor[0] = cg_RQ3_crosshairColorR.value;
crosshairColor[1] = cg_RQ3_crosshairColorG.value; crosshairColor[1] = cg_RQ3_crosshairColorG.value;
crosshairColor[2] = cg_RQ3_crosshairColorB.value; crosshairColor[2] = cg_RQ3_crosshairColorB.value;

5
reaction/game/g_cmds.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.143 2002/06/23 21:44:08 jbravo
// Fixed shots fired stats for non TP modes and some cleanups
//
// Revision 1.142 2002/06/23 19:27:18 niceass // Revision 1.142 2002/06/23 19:27:18 niceass
// bandage bug fix // bandage bug fix
// //
@ -1902,7 +1905,7 @@ void Cmd_CallVote_f(gentity_t * ent)
} else if (!Q_stricmp(arg1, "map")) { } else if (!Q_stricmp(arg1, "map")) {
// special case for map changes, we want to reset the nextmap setting // special case for map changes, we want to reset the nextmap setting
// this allows a player to change maps, but not upset the map rotation // this allows a player to change maps, but not upset the map rotation
char s[MAX_STRING_CHARS]; // char s[MAX_STRING_CHARS];
if ( !G_FileExists(va("maps/%s.bsp", arg2)) ) { if ( !G_FileExists(va("maps/%s.bsp", arg2)) ) {
trap_SendServerCommand(ent - g_entities, va("print \"The map %s does not exist.\n\"", arg2)); trap_SendServerCommand(ent - g_entities, va("print \"The map %s does not exist.\n\"", arg2));

7
reaction/game/g_weapon.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.67 2002/06/23 21:44:08 jbravo
// Fixed shots fired stats for non TP modes and some cleanups
//
// Revision 1.66 2002/06/16 20:06:14 jbravo // Revision 1.66 2002/06/16 20:06:14 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"
// //
@ -441,7 +444,9 @@ void Bullet_Fire(gentity_t * ent, float spread, int damage, int MOD)
int Material; int Material;
// Elder: Statistics tracking // Elder: Statistics tracking
if (ent->client && level.team_round_going) { // JBravo: Take NON TP modes into account
if (ent->client && ((g_gametype.integer == GT_TEAMPLAY && level.team_round_going) ||
g_gametype.integer != GT_TEAMPLAY)) {
switch (MOD) { switch (MOD) {
case MOD_PISTOL: case MOD_PISTOL:
ent->client->pers.records[REC_MK23SHOTS]++; ent->client->pers.records[REC_MK23SHOTS]++;

3
reaction/game/rxn_game.c
View file

@ -5,6 +5,9 @@
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// //
// $Log$ // $Log$
// Revision 1.16 2002/06/23 21:44:08 jbravo
// Fixed shots fired stats for non TP modes and some cleanups
//
// Revision 1.15 2002/06/23 19:24:19 niceass // Revision 1.15 2002/06/23 19:24:19 niceass
// bandage bug fix // bandage bug fix
// //