tenebrae/tenebrae2
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fixed typo with cg_thirdperson :P

Browse source
This commit is contained in:
lorderadicator 2003-02-17 22:23:37 +00:00
parent 86dd8cffdd
commit 2fd968c4a0
6 changed files with 22 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
chase.c
View file

@ -21,10 +21,10 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#include "quakedef.h" #include "quakedef.h"
cvar_t cg_thridpersonrange = {"cg_thridpersonrange", "100"}; cvar_t cg_thirdpersonrange = {"cg_thirdpersonrange", "100"};
cvar_t cg_thridpersonangle2 = {"cg_thridpersonangle2", "16"}; cvar_t cg_thirdpersonangle2 = {"cg_thirdpersonangle2", "16"};
cvar_t cg_thridpersonangle = {"cg_thridpersonangle", "0"}; cvar_t cg_thirdpersonangle = {"cg_thirdpersonangle", "0"};
cvar_t cg_thridperson = {"cg_thridperson", "0"}; cvar_t cg_thirdperson = {"cg_thirdperson", "0"};
vec3_t chase_pos; vec3_t chase_pos;
vec3_t chase_angles; 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) void Chase_Init (void)
{ {
Cvar_RegisterVariable (&cg_thridpersonrange); Cvar_RegisterVariable (&cg_thirdpersonrange);
Cvar_RegisterVariable (&cg_thridpersonangle2); Cvar_RegisterVariable (&cg_thirdpersonangle2);
Cvar_RegisterVariable (&cg_thridpersonangle); Cvar_RegisterVariable (&cg_thirdpersonangle);
Cvar_RegisterVariable (&cg_thridperson); Cvar_RegisterVariable (&cg_thirdperson);
} }
void Chase_Reset (void) void Chase_Reset (void)
@ -73,9 +73,9 @@ void Chase_Update (void)
// calc exact destination // calc exact destination
for (i=0 ; i<3 ; i++) for (i=0 ; i<3 ; i++)
chase_dest[i] = r_refdef.vieworg[i] chase_dest[i] = r_refdef.vieworg[i]
- forward[i]*cg_thridpersonrange.value - forward[i]*cg_thirdpersonrange.value
- right[i]*cg_thridpersonangle.value; - right[i]*cg_thirdpersonangle.value;
chase_dest[2] = r_refdef.vieworg[2] + cg_thridpersonangle2.value; chase_dest[2] = r_refdef.vieworg[2] + cg_thirdpersonangle2.value;
// find the spot the player is looking at // find the spot the player is looking at
VectorMA (r_refdef.vieworg, 4096, forward, dest); VectorMA (r_refdef.vieworg, 4096, forward, dest);

2
cl_main.c
View file

@ -743,7 +743,7 @@ void CL_RelinkEntities (void)
ent->forcelink = false; ent->forcelink = false;
if (i == cl.viewentity && !cg_thridperson.value) if (i == cl.viewentity && !cg_thirdperson.value)
continue; continue;
#ifdef QUAKE2 #ifdef QUAKE2

8
gl_rmain.c
View file

@ -1326,7 +1326,7 @@ void R_DrawEntitiesShadowVolumes (int type)
if ((currententity->model->type == type) if ((currententity->model->type == type)
&& (type == mod_alias) && (type == mod_alias)
&& (sh_playershadow.value) && (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 //for lights cast by the player don't add the player's shadow
if (currentshadowlight->owner != currententity) { if (currentshadowlight->owner != currententity) {
//HACK: only horizontal angle this looks better //HACK: only horizontal angle this looks better
@ -1473,7 +1473,7 @@ void R_DrawViewModel (void)
if (!cg_showviewmodel.value) if (!cg_showviewmodel.value)
return; return;
if (cg_thridperson.value) if (cg_thirdperson.value)
return; return;
if (envmap) if (envmap)
@ -1523,7 +1523,7 @@ void R_DrawViewModelLight (void)
if (!cg_showviewmodel.value) if (!cg_showviewmodel.value)
return; return;
if (cg_thridperson.value) if (cg_thirdperson.value)
return; return;
if (envmap) if (envmap)
@ -1566,7 +1566,7 @@ qboolean R_ShouldDrawViewModel (void)
if (!cg_showviewmodel.value) if (!cg_showviewmodel.value)
return false; return false;
if (cg_thridperson.value) if (cg_thirdperson.value)
return false; return false;
if (envmap) if (envmap)

4
menu.c
View file

@ -1258,7 +1258,7 @@ void M_AdjustSliders (int dir)
Cvar_SetValue ("cg_showfps", !cg_showfps.value); Cvar_SetValue ("cg_showfps", !cg_showfps.value);
break; break;
case 15: case 15:
Cvar_SetValue ("cg_thridperson", !cg_thridperson.value); Cvar_SetValue ("cg_thirdperson", !cg_thirdperson.value);
break; break;
case 16: case 16:
Cvar_SetValue ("sh_glares", !sh_glares.value); Cvar_SetValue ("sh_glares", !sh_glares.value);
@ -1368,7 +1368,7 @@ void M_Options_Draw (void)
M_DrawCheckbox (220, 144, cg_showfps.value); M_DrawCheckbox (220, 144, cg_showfps.value);
M_Print (16, 152," Third Person"); 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_Print (16, 160," Glares");
M_DrawCheckbox (220, 160, sh_glares.value); M_DrawCheckbox (220, 160, sh_glares.value);

3
quakedef.h
View file

@ -353,11 +353,12 @@ extern qboolean isDedicated;
extern int minimum_memory; extern int minimum_memory;
extern qboolean fullsbardraw; extern qboolean fullsbardraw;
// //
// chase // chase
// //
extern cvar_t cg_thridperson; extern cvar_t cg_thirdperson;
void Chase_Init (void); void Chase_Init (void);
void Chase_Reset (void); void Chase_Reset (void);

2
view.c
View file

@ -984,7 +984,7 @@ if (cl.onground && ent->origin[2] - oldz > 0)
else else
oldz = ent->origin[2]; oldz = ent->origin[2];
if (cg_thridperson.value) if (cg_thirdperson.value)
Chase_Update (); Chase_Update ();
} }