yquake2/yquake2remaster
0
0
Fork 0
mirror of https://github.com/yquake2/yquake2remaster.git synced 2024-11-22 20:51:31 +00:00
Code Issues Projects Releases Packages Wiki Activity

cl_view Grundaufräumarbeiten

Browse source
This commit is contained in:
Yamagi Burmeister 2009-03-02 22:27:59 +00:00
parent ccd0d1b8b2
commit 2d16edd841
1 changed files with 1 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

64
src/client/cl_view.c
View file

@ -54,25 +54,6 @@ lightstyle_t r_lightstyles[MAX_LIGHTSTYLES];
char cl_weaponmodels[MAX_CLIENTWEAPONMODELS][MAX_QPATH]; char cl_weaponmodels[MAX_CLIENTWEAPONMODELS][MAX_QPATH];
int num_cl_weaponmodels; int num_cl_weaponmodels;
#ifdef QMAX
/*
====================
CL_Trace
====================
*/
trace_t CL_Trace (vec3_t start, vec3_t end, float size, int contentmask)
{
vec3_t maxs, mins;
VectorSet(maxs, size, size, size);
VectorSet(mins, -size, -size, -size);
return CM_BoxTrace (start, end, mins, maxs, 0, contentmask);
}
#endif
/* /*
==================== ====================
V_ClearScene V_ClearScene
@ -87,7 +68,6 @@ void V_ClearScene (void)
r_numparticles = 0; r_numparticles = 0;
} }
/* /*
===================== =====================
V_AddEntity V_AddEntity
@ -101,41 +81,12 @@ void V_AddEntity (entity_t *ent)
r_entities[r_numentities++] = *ent; r_entities[r_numentities++] = *ent;
} }
/* /*
===================== =====================
V_AddParticle V_AddParticle
===================== =====================
*/ */
#ifdef QMAX
void V_AddParticle (vec3_t org, vec3_t angle, vec3_t color, float alpha, float size, int image, int flags)
{
int i;
particle_t *p;
if (r_numparticles >= MAX_PARTICLES)
return;
p = &r_particles[r_numparticles++];
for (i=0;i<3;i++)
{
p->origin[i] = org[i];
p->angle[i] = angle[i];
}
p->red = color[0];
p->green = color[1];
p->blue = color[2];
p->alpha = alpha;
p->image = image;
p->flags = flags;
p->size = size;
}
#else
void V_AddParticle (vec3_t org, int color, float alpha) void V_AddParticle (vec3_t org, int color, float alpha)
{ {
particle_t *p; particle_t *p;
@ -147,7 +98,7 @@ void V_AddParticle (vec3_t org, int color, float alpha)
p->color = color; p->color = color;
p->alpha = alpha; p->alpha = alpha;
} }
#endif
/* /*
===================== =====================
V_AddLight V_AddLight
@ -168,7 +119,6 @@ void V_AddLight (vec3_t org, float intensity, float r, float g, float b)
dl->color[2] = b; dl->color[2] = b;
} }
/* /*
===================== =====================
V_AddLightStyle V_AddLightStyle
@ -470,9 +420,6 @@ SCR_DrawCrosshair
*/ */
void SCR_DrawCrosshair (void) void SCR_DrawCrosshair (void)
{ {
#ifdef QMAX
float scale;
#endif
if (!crosshair->value) if (!crosshair->value)
return; return;
@ -494,17 +441,8 @@ void SCR_DrawCrosshair (void)
if (!crosshair_pic[0]) if (!crosshair_pic[0])
return; return;
#ifdef QMAX
scale = crosshair_scale->value * (viddef.width/640);
re.DrawScaledPic (scr_vrect.x + ((scr_vrect.width - crosshair_width)>>1) //width
, scr_vrect.y + ((scr_vrect.height - crosshair_height)>>1) //height
, scale //scale
, 0.75 + 0.25*sin(anglemod(cl.time*0.005)) //alpha
, crosshair_pic); //pic
#else
re.DrawPic (scr_vrect.x + ((scr_vrect.width - crosshair_width)>>1) re.DrawPic (scr_vrect.x + ((scr_vrect.width - crosshair_width)>>1)
, scr_vrect.y + ((scr_vrect.height - crosshair_height)>>1), crosshair_pic); , scr_vrect.y + ((scr_vrect.height - crosshair_height)>>1), crosshair_pic);
#endif
} }
/* /*