diff --git a/reaction/cgame/cg_draw.c b/reaction/cgame/cg_draw.c index 39b5e3b0..6a0f4e88 100644 --- a/reaction/cgame/cg_draw.c +++ b/reaction/cgame/cg_draw.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// 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 +// // Revision 1.48 2002/06/20 21:25:06 slicer // Fixed issues with cg_drawCrosshair 0, for SSG Scope and teammates Names // @@ -1599,7 +1602,7 @@ static void CG_DrawCrosshair(void) qhandle_t hShader; float f; float x, y; - int ca, i; + int ca, i, drawSSG; vec4_t crosshairColor; //Slicer: HOW ABOUT SSG SCOPE !! GAHHH !!!!! - moved below @@ -1607,6 +1610,7 @@ static void CG_DrawCrosshair(void) // return; //} //Slicer: Adding Crosshair to FOLLOW SPECS + drawSSG = 0; if (cg.snap->ps.persistant[PERS_TEAM] == TEAM_SPECTATOR && !(cg.snap->ps.pm_flags & PMF_FOLLOW)) { return; } @@ -1680,13 +1684,15 @@ static void CG_DrawCrosshair(void) CG_DrawPic(x - 128, y - 128, 256, 256, cgs.media.ssgCrosshair[zoomMag]); trap_R_SetColor(NULL); - return; + drawSSG = 1; } } - else { + //Slicer if no crosshair, and not using SSG, dont draw crosshair if(!cg_drawCrosshair.integer) return; + if (drawSSG == 0 || drawSSG == 1 && cg_RQ3_overlaycrosshair.integer == 1) + { x = cg_crosshairX.integer; y = cg_crosshairY.integer; CG_AdjustFrom640(&x, &y, &w, &h); diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h index b635b12c..d3a06188 100644 --- a/reaction/cgame/cg_local.h +++ b/reaction/cgame/cg_local.h @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.100 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 +// // Revision 1.99 2002/06/21 21:05:57 niceass // laserfog stuff & removed unused cvar // @@ -1586,6 +1589,9 @@ extern vmCvar_t cg_RQ3_crosshairColorG; extern vmCvar_t cg_RQ3_crosshairColorB; extern vmCvar_t cg_RQ3_crosshairColorA; +//Blaze: allow regular crosshair to be overlaid ontop of the ssg crosshair +extern vmCvar_t cg_RQ3_overlaycrosshair; + // JBravo: cvar for tkok popups extern vmCvar_t cg_RQ3_tkokAutoPopup; diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c index 8b3c9a78..d127433f 100644 --- a/reaction/cgame/cg_main.c +++ b/reaction/cgame/cg_main.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.88 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 +// // Revision 1.87 2002/06/21 21:05:35 niceass // laserfog stuff & removed unused cvar // @@ -332,6 +335,9 @@ vmCvar_t cg_RQ3_crosshairColorG; vmCvar_t cg_RQ3_crosshairColorB; vmCvar_t cg_RQ3_crosshairColorA; +//Blaze: allow regular crosshair to be overlaid ontop of the ssg crosshair +vmCvar_t cg_RQ3_overlaycrosshair; + // JBravo: cvar for tkok popup vmCvar_t cg_RQ3_tkokAutoPopup; @@ -552,6 +558,9 @@ static cvarTable_t cvarTable[] = { // bk001129 {&cg_RQ3_ssgColorG, "cg_RQ3_ssgColorG", "1.0", CVAR_ARCHIVE}, {&cg_RQ3_ssgColorB, "cg_RQ3_ssgColorB", "0.0", CVAR_ARCHIVE}, {&cg_RQ3_ssgColorA, "cg_RQ3_ssgColorA", "0.75", CVAR_ARCHIVE}, + //Blaze: allow regular crosshair to be overlaid ontop of the ssg crosshair + {&cg_RQ3_overlaycrosshair, "cg_RQ3_overlaycrosshair", "0", CVAR_ARCHIVE}, + // JBravo: cvars for regular crosshairs and their colors // Makro - changed default color to white; it was 0/1/0/.75 before {&cg_RQ3_crosshairColorR, "cg_RQ3_crosshairColorR", "1.0", CVAR_ARCHIVE},