diff --git a/chase.c b/chase.c index 31e4bb2..c50edfc 100644 --- a/chase.c +++ b/chase.c @@ -21,10 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "quakedef.h" -cvar_t cg_thridpersonrange = {"cg_thridpersonrange", "100"}; -cvar_t cg_thridpersonangle2 = {"cg_thridpersonangle2", "16"}; -cvar_t cg_thridpersonangle = {"cg_thridpersonangle", "0"}; -cvar_t cg_thridperson = {"cg_thridperson", "0"}; +cvar_t cg_thirdpersonrange = {"cg_thirdpersonrange", "100"}; +cvar_t cg_thirdpersonangle2 = {"cg_thirdpersonangle2", "16"}; +cvar_t cg_thirdpersonangle = {"cg_thirdpersonangle", "0"}; +cvar_t cg_thirdperson = {"cg_thirdperson", "0"}; vec3_t chase_pos; vec3_t chase_angles; @@ -37,10 +37,10 @@ extern qboolean SV_RecursiveHullCheck (model_t *m, int num, float p1f, float p2f void Chase_Init (void) { - Cvar_RegisterVariable (&cg_thridpersonrange); - Cvar_RegisterVariable (&cg_thridpersonangle2); - Cvar_RegisterVariable (&cg_thridpersonangle); - Cvar_RegisterVariable (&cg_thridperson); + Cvar_RegisterVariable (&cg_thirdpersonrange); + Cvar_RegisterVariable (&cg_thirdpersonangle2); + Cvar_RegisterVariable (&cg_thirdpersonangle); + Cvar_RegisterVariable (&cg_thirdperson); } void Chase_Reset (void) @@ -73,9 +73,9 @@ void Chase_Update (void) // calc exact destination for (i=0 ; i<3 ; i++) chase_dest[i] = r_refdef.vieworg[i] - - forward[i]*cg_thridpersonrange.value - - right[i]*cg_thridpersonangle.value; - chase_dest[2] = r_refdef.vieworg[2] + cg_thridpersonangle2.value; + - forward[i]*cg_thirdpersonrange.value + - right[i]*cg_thirdpersonangle.value; + chase_dest[2] = r_refdef.vieworg[2] + cg_thirdpersonangle2.value; // find the spot the player is looking at VectorMA (r_refdef.vieworg, 4096, forward, dest); diff --git a/cl_main.c b/cl_main.c index 800f637..2ce5059 100644 --- a/cl_main.c +++ b/cl_main.c @@ -743,7 +743,7 @@ void CL_RelinkEntities (void) ent->forcelink = false; - if (i == cl.viewentity && !cg_thridperson.value) + if (i == cl.viewentity && !cg_thirdperson.value) continue; #ifdef QUAKE2 diff --git a/gl_rmain.c b/gl_rmain.c index 0255fe6..3c304cd 100644 --- a/gl_rmain.c +++ b/gl_rmain.c @@ -1326,7 +1326,7 @@ void R_DrawEntitiesShadowVolumes (int type) if ((currententity->model->type == type) && (type == mod_alias) && (sh_playershadow.value) - && (!cg_thridperson.value)) { //Fix for two player shadows in chase cam - Eradicator + && (!cg_thirdperson.value)) { //Fix for two player shadows in chase cam - Eradicator //for lights cast by the player don't add the player's shadow if (currentshadowlight->owner != currententity) { //HACK: only horizontal angle this looks better @@ -1473,7 +1473,7 @@ void R_DrawViewModel (void) if (!cg_showviewmodel.value) return; - if (cg_thridperson.value) + if (cg_thirdperson.value) return; if (envmap) @@ -1523,7 +1523,7 @@ void R_DrawViewModelLight (void) if (!cg_showviewmodel.value) return; - if (cg_thridperson.value) + if (cg_thirdperson.value) return; if (envmap) @@ -1566,7 +1566,7 @@ qboolean R_ShouldDrawViewModel (void) if (!cg_showviewmodel.value) return false; - if (cg_thridperson.value) + if (cg_thirdperson.value) return false; if (envmap) diff --git a/menu.c b/menu.c index 6b4b2ea..2cb4177 100644 --- a/menu.c +++ b/menu.c @@ -1258,7 +1258,7 @@ void M_AdjustSliders (int dir) Cvar_SetValue ("cg_showfps", !cg_showfps.value); break; case 15: - Cvar_SetValue ("cg_thridperson", !cg_thridperson.value); + Cvar_SetValue ("cg_thirdperson", !cg_thirdperson.value); break; case 16: Cvar_SetValue ("sh_glares", !sh_glares.value); @@ -1368,7 +1368,7 @@ void M_Options_Draw (void) M_DrawCheckbox (220, 144, cg_showfps.value); M_Print (16, 152," Third Person"); - M_DrawCheckbox (220, 152, cg_thridperson.value); + M_DrawCheckbox (220, 152, cg_thirdperson.value); M_Print (16, 160," Glares"); M_DrawCheckbox (220, 160, sh_glares.value); diff --git a/quakedef.h b/quakedef.h index ef17f9e..14afa77 100644 --- a/quakedef.h +++ b/quakedef.h @@ -352,12 +352,13 @@ extern int current_skill; // skill level for currently loaded level (in case extern qboolean isDedicated; extern int minimum_memory; - + + extern qboolean fullsbardraw; // // chase // -extern cvar_t cg_thridperson; +extern cvar_t cg_thirdperson; void Chase_Init (void); void Chase_Reset (void); diff --git a/view.c b/view.c index 53c9ed3..ddced90 100644 --- a/view.c +++ b/view.c @@ -984,7 +984,7 @@ if (cl.onground && ent->origin[2] - oldz > 0) else oldz = ent->origin[2]; - if (cg_thridperson.value) + if (cg_thirdperson.value) Chase_Update (); }