From a629681d2321d29bd56ae99082fd670d9ef17940 Mon Sep 17 00:00:00 2001 From: divverent Date: Wed, 25 Jun 2008 17:39:15 +0000 Subject: [PATCH] in "bf", make alpha and alphafade optional (if left out, they will default to the usual "bf" values) git-svn-id: svn://svn.icculus.org/twilight/trunk/darkplaces@8373 d7cf8633-e32d-0410-b094-e92efae38249 --- view.c | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/view.c b/view.c index 6fbf4ed9..72d812bb 100644 --- a/view.c +++ b/view.c @@ -312,16 +312,22 @@ static void V_BonusFlash_f (void) cl.cshifts[CSHIFT_BONUS].percent = 50; cl.cshifts[CSHIFT_BONUS].alphafade = 100; } - else if(Cmd_Argc() == 6) + else if(Cmd_Argc() >= 4 && Cmd_Argc() <= 6) { cl.cshifts[CSHIFT_BONUS].destcolor[0] = atof(Cmd_Argv(1)) * 255; cl.cshifts[CSHIFT_BONUS].destcolor[1] = atof(Cmd_Argv(2)) * 255; cl.cshifts[CSHIFT_BONUS].destcolor[2] = atof(Cmd_Argv(3)) * 255; - cl.cshifts[CSHIFT_BONUS].percent = atof(Cmd_Argv(4)) * 255; // yes, these are HEXADECIMAL percent ;) - cl.cshifts[CSHIFT_BONUS].alphafade = atof(Cmd_Argv(5)) * 255; + if(Cmd_Argc() >= 5) + cl.cshifts[CSHIFT_BONUS].percent = atof(Cmd_Argv(4)) * 255; // yes, these are HEXADECIMAL percent ;) + else + cl.cshifts[CSHIFT_BONUS].percent = 50; + if(Cmd_Argc() >= 6) + cl.cshifts[CSHIFT_BONUS].alphafade = atof(Cmd_Argv(5)) * 255; + else + cl.cshifts[CSHIFT_BONUS].alphafade = 100; } else - Con_Printf("usage:\nbf, or bf R G B A alphafade\n"); + Con_Printf("usage:\nbf, or bf R G B [A [alphafade]]\n"); } /* @@ -713,7 +719,7 @@ V_Init void V_Init (void) { Cmd_AddCommand ("v_cshift", V_cshift_f, "sets tint color of view"); - Cmd_AddCommand ("bf", V_BonusFlash_f, "briefly flashes a bright color tint on view (used when items are picked up); optionally takes R G B A alphafade arguments to specify how the flash looks"); + Cmd_AddCommand ("bf", V_BonusFlash_f, "briefly flashes a bright color tint on view (used when items are picked up); optionally takes R G B [A [alphafade]] arguments to specify how the flash looks"); Cmd_AddCommand ("centerview", V_StartPitchDrift, "gradually recenter view (stop looking up/down)"); Cvar_RegisterVariable (&v_centermove); -- 2.39.2