diff --git a/reaction/cgame/cg_draw.c b/reaction/cgame/cg_draw.c index 58309182..02f07d58 100644 --- a/reaction/cgame/cg_draw.c +++ b/reaction/cgame/cg_draw.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.42 2002/05/19 18:32:11 jbravo +// Made new cvars for regular xhair colors. +// // Revision 1.41 2002/05/18 03:55:35 niceass // many misc. changes // @@ -2352,10 +2355,10 @@ static void CG_DrawCrosshair(void) { } hShader = cgs.media.crosshairShader[ ca % NUM_CROSSHAIRS ]; //} - crosshairColor[0] = cg_RQ3_ssgColorR.value; - crosshairColor[1] = cg_RQ3_ssgColorG.value; - crosshairColor[2] = cg_RQ3_ssgColorB.value; - crosshairColor[3] = cg_RQ3_ssgColorA.value; + crosshairColor[0] = cg_RQ3_crosshairColorR.value; + crosshairColor[1] = cg_RQ3_crosshairColorG.value; + crosshairColor[2] = cg_RQ3_crosshairColorB.value; + crosshairColor[3] = cg_RQ3_crosshairColorA.value; for (i = 0; i < 4; i++) { if (crosshairColor[i] > 1.0f) crosshairColor[i] = 1.0f; diff --git a/reaction/cgame/cg_local.h b/reaction/cgame/cg_local.h index 3712b92e..c7102425 100644 --- a/reaction/cgame/cg_local.h +++ b/reaction/cgame/cg_local.h @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.77 2002/05/19 18:32:11 jbravo +// Made new cvars for regular xhair colors. +// // Revision 1.76 2002/05/18 21:58:53 blaze // cg_rq3_autoaction support // @@ -1598,6 +1601,11 @@ extern vmCvar_t cg_RQ3_ssgColorR; extern vmCvar_t cg_RQ3_ssgColorG; extern vmCvar_t cg_RQ3_ssgColorB; extern vmCvar_t cg_RQ3_ssgColorA; +// JBravo: normal crosshair colors +extern vmCvar_t cg_RQ3_crosshairColorR; +extern vmCvar_t cg_RQ3_crosshairColorG; +extern vmCvar_t cg_RQ3_crosshairColorB; +extern vmCvar_t cg_RQ3_crosshairColorA; //Elder: SSG unique sensitivities extern vmCvar_t cg_RQ3_ssgSensitivityAuto; extern vmCvar_t cg_RQ3_ssgSensitivity2x; diff --git a/reaction/cgame/cg_main.c b/reaction/cgame/cg_main.c index 4511184d..6aeb0752 100644 --- a/reaction/cgame/cg_main.c +++ b/reaction/cgame/cg_main.c @@ -5,6 +5,9 @@ //----------------------------------------------------------------------------- // // $Log$ +// Revision 1.66 2002/05/19 18:32:11 jbravo +// Made new cvars for regular xhair colors. +// // Revision 1.65 2002/05/18 03:55:35 niceass // many misc. changes // @@ -265,6 +268,11 @@ vmCvar_t cg_RQ3_ssgColorR; vmCvar_t cg_RQ3_ssgColorG; vmCvar_t cg_RQ3_ssgColorB; vmCvar_t cg_RQ3_ssgColorA; +// JBravo: normal crosshair colors +vmCvar_t cg_RQ3_crosshairColorR; +vmCvar_t cg_RQ3_crosshairColorG; +vmCvar_t cg_RQ3_crosshairColorB; +vmCvar_t cg_RQ3_crosshairColorA; //Elder: SSG unique sensitivities vmCvar_t cg_RQ3_ssgSensitivityAuto; vmCvar_t cg_RQ3_ssgSensitivity2x; @@ -484,6 +492,11 @@ 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 }, +// JBravo: cvars for regular crosshairs and their colors + { &cg_RQ3_crosshairColorR, "cg_RQ3_crosshairColorR", "0.0", CVAR_ARCHIVE }, + { &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_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 },