fte/quakespasm
2
0
Fork 0
mirror of https://github.com/Shpoike/Quakespasm.git synced 2025-02-15 08:31:03 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix misc gcc warnings.

Browse source
This commit is contained in:
Shpoike 2023-07-25 15:08:00 +01:00
parent 980ab70765
commit 06a1f39d43
8 changed files with 10 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Quake/cl_parse.c
View file

@ -557,7 +557,6 @@ static void CL_EntitiesDeltaed(void)
qmodel_t *model; qmodel_t *model;
qboolean forcelink; qboolean forcelink;
entity_t *ent; entity_t *ent;
int skin;
for (newnum = 1; newnum < cl.num_entities; newnum++) for (newnum = 1; newnum < cl.num_entities; newnum++)
{ {

4
Quake/gl_draw.c
View file

@ -707,8 +707,8 @@ Only used for the player color selection menu
*/ */
void Draw_TransPicTranslate (int x, int y, qpic_t *pic, plcolour_t top, plcolour_t bottom) void Draw_TransPicTranslate (int x, int y, qpic_t *pic, plcolour_t top, plcolour_t bottom)
{ {
static plcolour_t oldtop = {-2}; static plcolour_t oldtop = {{-2}};
static plcolour_t oldbottom = {-2}; static plcolour_t oldbottom = {{-2}};
if (!CL_PLColours_Equals(top, oldtop) || !CL_PLColours_Equals(bottom, oldbottom)) if (!CL_PLColours_Equals(top, oldtop) || !CL_PLColours_Equals(bottom, oldbottom))
{ {

2
Quake/gl_mesh.c
View file

@ -628,7 +628,7 @@ void Mod_LoadMD3Model (qmodel_t *mod, void *buffer)
for (numskinfiles = 0; numskinfiles < countof(skinfile); numskinfiles++) for (numskinfiles = 0; numskinfiles < countof(skinfile); numskinfiles++)
{ //q3 doesn't really support multiple skins any other way. plus this lets us fix up some texture paths... { //q3 doesn't really support multiple skins any other way. plus this lets us fix up some texture paths...
skinfile[numskinfiles] = COM_LoadMallocFile(va("%s_%i.skin", diskname, numskinfiles), NULL); skinfile[numskinfiles] = (char*)COM_LoadMallocFile(va("%s_%i.skin", diskname, numskinfiles), NULL);
if (!skinfile[numskinfiles]) if (!skinfile[numskinfiles])
break; break;
} }

2
Quake/gl_model.c
View file

@ -343,7 +343,6 @@ static qmodel_t *Mod_LoadModel (qmodel_t *mod, qboolean crash)
byte *buf; byte *buf;
byte stackbuf[1024]; // avoid dirtying the cache heap byte stackbuf[1024]; // avoid dirtying the cache heap
int mod_type; int mod_type;
int i;
if (!mod->needload) if (!mod->needload)
{ {
@ -759,7 +758,6 @@ static void Mod_LoadTextures (lump_t *l)
int mark, fwidth, fheight; int mark, fwidth, fheight;
char filename[MAX_OSPATH], mapname[MAX_OSPATH]; char filename[MAX_OSPATH], mapname[MAX_OSPATH];
byte *data; byte *data;
extern byte *hunk_base;
//johnfitz //johnfitz
qboolean malloced; //spike qboolean malloced; //spike
enum srcformat fmt; //spike enum srcformat fmt; //spike

4
Quake/gl_texmgr.c
View file

@ -76,6 +76,10 @@ static struct
{"RGBA4444", "4444", GL_RGBA4,GL_RGBA,GL_UNSIGNED_SHORT_4_4_4_4, 2, 1, 1, NULL}, {"RGBA4444", "4444", GL_RGBA4,GL_RGBA,GL_UNSIGNED_SHORT_4_4_4_4, 2, 1, 1, NULL},
{"RGBA5551", "5551", GL_RGB5_A1,GL_RGBA,GL_UNSIGNED_SHORT_5_5_5_1, 2, 1, 1, NULL}, {"RGBA5551", "5551", GL_RGB5_A1,GL_RGBA,GL_UNSIGNED_SHORT_5_5_5_1, 2, 1, 1, NULL},
{"L8", "LUM8", GL_LUMINANCE8,GL_LUMINANCE,GL_UNSIGNED_BYTE, 1, 1, 1, NULL}, {"L8", "LUM8", GL_LUMINANCE8,GL_LUMINANCE,GL_UNSIGNED_BYTE, 1, 1, 1, NULL},
#ifndef GL_VERSION_3_0
#define GL_RGB9_E5 0x8C3D
#define GL_UNSIGNED_INT_5_9_9_9_REV 0x8C3E
#endif
{"E5BGR9", "EXP5", GL_RGB9_E5,GL_RGB,GL_UNSIGNED_INT_5_9_9_9_REV, 4, 1, 1, &gl_texture_e5bgr9}, {"E5BGR9", "EXP5", GL_RGB9_E5,GL_RGB,GL_UNSIGNED_INT_5_9_9_9_REV, 4, 1, 1, &gl_texture_e5bgr9},
#if defined(GL_EXT_texture_compression_s3tc) || defined(GL_EXT_texture_compression_dxt1) #if defined(GL_EXT_texture_compression_s3tc) || defined(GL_EXT_texture_compression_dxt1)
{"BC1_RGBA", "BC1", GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,0,0, 8, 4, 4, &gl_texture_s3tc}, {"BC1_RGBA", "BC1", GL_COMPRESSED_RGBA_S3TC_DXT1_EXT,0,0, 8, 4, 4, &gl_texture_s3tc},

4
Quake/pr_ext.c
View file

@ -8485,7 +8485,7 @@ void PF_Fixme (void)
PR_RunError ("PF_Fixme: not a builtin..."); PR_RunError ("PF_Fixme: not a builtin...");
} }
static void PF_Fixme_noext (void) /*static void PF_Fixme_noext (void)
{ {
//interrogate the vm to try to figure out exactly which builtin they just tried to execute. //interrogate the vm to try to figure out exactly which builtin they just tried to execute.
dstatement_t *st = &qcvm->statements[qcvm->xstatement]; dstatement_t *st = &qcvm->statements[qcvm->xstatement];
@ -8499,7 +8499,7 @@ static void PF_Fixme_noext (void)
PR_RunError ("unimplemented builtin #%i - %s", binum, funcname); PR_RunError ("unimplemented builtin #%i - %s", binum, funcname);
} }
PR_RunError ("PF_Fixme: not a builtin..."); PR_RunError ("PF_Fixme: not a builtin...");
} }*/
//called at map end //called at map end

2
Quake/r_brush.c
View file

@ -819,7 +819,7 @@ static void BuildSurfaceDisplayList (msurface_t *fa)
int i, lindex, lnumverts; int i, lindex, lnumverts;
medge_t *pedges, *r_pedge; medge_t *pedges, *r_pedge;
float *vec; float *vec;
float s, t, s0, t0, sdiv, tdiv; float s, t, s0, t0;
glpoly_t *poly; glpoly_t *poly;
int lmscale = (1<<fa->lmshift); int lmscale = (1<<fa->lmshift);

5
Quake/r_world.c
View file

@ -710,15 +710,10 @@ void R_DrawTextureChains_Water (qmodel_t *model, entity_t *ent, texchain_t chain
glpoly_t *p; glpoly_t *p;
qboolean bound; qboolean bound;
float entalpha; float entalpha;
qboolean has_lit_water;
qboolean has_unlit_water;
if (r_drawflat_cheatsafe || r_lightmap_cheatsafe) // ericw -- !r_drawworld_cheatsafe check moved to R_DrawWorld_Water () if (r_drawflat_cheatsafe || r_lightmap_cheatsafe) // ericw -- !r_drawworld_cheatsafe check moved to R_DrawWorld_Water ()
return; return;
has_lit_water = false;
has_unlit_water = false;
if (gl_glsl_water_able) if (gl_glsl_water_able)
{ {
int lastlightmap = -2; int lastlightmap = -2;