fte/fteqw
2
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity

warning fixes

Browse source 
git-svn-id: https://svn.code.sf.net/p/fteqw/code/trunk@1350 fc73d0e0-1445-4013-8a0c-d673dee63da5
This commit is contained in:
TimeServ 2005-09-21 01:21:35 +00:00
parent be6d3c64fd
commit b7318bfaf4
5 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
engine/client/zqtp.c
View file

@ -3189,6 +3189,8 @@ qboolean TP_SuppressMessage(char *buf) {
return false; return false;
} }
void CL_PrintChat(player_info_t *plr, char *rawmsg, char *msg, int plrflags);
void CL_Say (qboolean team, char *extra) void CL_Say (qboolean team, char *extra)
{ {
extern cvar_t cl_fakename; extern cvar_t cl_fakename;
@ -3228,7 +3230,6 @@ void CL_Say (qboolean team, char *extra)
extern cvar_t cl_standardchat; extern cvar_t cl_standardchat;
//print it locally: //print it locally:
char *d; char *d;
char colouration;
for (s = sendtext, d = text; *s; s++, d++) for (s = sendtext, d = text; *s; s++, d++)
{ {
if (*s == '\xff') //text that is hidden to us if (*s == '\xff') //text that is hidden to us

4
engine/gl/gl_heightmap.c
View file

@ -265,10 +265,10 @@ int Heightmap_PointContents(model_t *model, vec3_t org)
return Heightmap_PointContentsHM(hm, 0, org); return Heightmap_PointContentsHM(hm, 0, org);
} }
float Heightmap_Normal(heightmap_t *hm, vec3_t org, vec3_t norm) void Heightmap_Normal(heightmap_t *hm, vec3_t org, vec3_t norm)
{ {
float x, y; float x, y;
float z, tz; float z;
int sx, sy; int sx, sy;
x = org[0]/hm->terrainscale; x = org[0]/hm->terrainscale;

7
engine/gl/gl_ppl.c
View file

@ -1758,7 +1758,6 @@ void PPL_BaseBModelTextures(entity_t *e)
void R_DrawLightning(entity_t *e) void R_DrawLightning(entity_t *e)
{ {
vec3_t v; vec3_t v;
vec3_t v2;
vec3_t dir, cr; vec3_t dir, cr;
float scale = e->scale; float scale = e->scale;
float length; float length;
@ -1825,7 +1824,6 @@ void R_DrawLightning(entity_t *e)
void R_DrawRailCore(entity_t *e) void R_DrawRailCore(entity_t *e)
{ {
vec3_t v; vec3_t v;
vec3_t v2;
vec3_t dir, cr; vec3_t dir, cr;
float scale = e->scale; float scale = e->scale;
float length; float length;
@ -2038,7 +2036,7 @@ void PPL_BaseEntTextures(void)
{ {
extern qboolean r_inmirror; extern qboolean r_inmirror;
extern model_t *currentmodel; extern model_t *currentmodel;
int i,j; int i;
if (!r_drawentities.value) if (!r_drawentities.value)
return; return;
@ -2891,7 +2889,7 @@ void PPL_LightBModelTextures(entity_t *e, dlight_t *light, vec3_t colour)
//draw the bumps on the models for each light. //draw the bumps on the models for each light.
void PPL_DrawEntLighting(dlight_t *light, vec3_t colour) void PPL_DrawEntLighting(dlight_t *light, vec3_t colour)
{ {
int i, j; int i;
PPL_LightTextures(cl.worldmodel, r_worldentity.origin, light, colour); PPL_LightTextures(cl.worldmodel, r_worldentity.origin, light, colour);
@ -5146,7 +5144,6 @@ void PPL_BeginShadowMesh(dlight_t *dl)
} }
void PPL_FinishShadowMesh(dlight_t *dl) void PPL_FinishShadowMesh(dlight_t *dl)
{ {
int i;
if (!buildingmesh) if (!buildingmesh)
return; return;

3
engine/gl/gl_rmain.c
View file

@ -852,7 +852,7 @@ R_DrawEntitiesOnList
*/ */
void GLR_DrawEntitiesOnList (void) void GLR_DrawEntitiesOnList (void)
{ {
int i, j; int i;
if (!r_drawentities.value) if (!r_drawentities.value)
return; return;
@ -1821,7 +1821,6 @@ void R_MirrorAddPlayerModels (void)
void R_Mirror (void) void R_Mirror (void)
{ {
float d;
msurface_t *s, *prevs, *prevr, *rejects; msurface_t *s, *prevs, *prevr, *rejects;
// entity_t *ent; // entity_t *ent;
mplane_t *mirror_plane; mplane_t *mirror_plane;

15
engine/sw/sw_draw.c
View file

@ -1738,6 +1738,21 @@ void SWDraw_Image (float xp, float yp, float wp, float hp, float s1, float t1, f
if (!pic) if (!pic)
return; return;
// scale call against console vs actual video ration
{
// this has to be done this way because CSQC drawing needs
// to respect these cvars
extern cvar_t vid_conheight, vid_conwidth;
xratio = vid.width / vid_conwidth.value;
yratio = vid.height / vid_conheight.value;
xp *= xratio;
yp *= yratio;
wp *= xratio;
hp *= yratio;
}
// image scale
xratio = pic->width / wp; xratio = pic->width / wp;
yratio = pic->height / hp; yratio = pic->height / hp;