mirror of
https://git.code.sf.net/p/quake/quakeforge
synced 2025-01-17 22:50:51 +00:00
Make gcc2 stfu.
This commit is contained in:
parent
4260f55759
commit
dd0332632e
1 changed files with 3 additions and 5 deletions
|
@ -224,7 +224,6 @@ Draw_CachePic (const char *path, qboolean alpha)
|
||||||
cachepic_t *pic;
|
cachepic_t *pic;
|
||||||
int i;
|
int i;
|
||||||
glpic_t *gl;
|
glpic_t *gl;
|
||||||
qpic_t *dat;
|
|
||||||
QFile *f;
|
QFile *f;
|
||||||
tex_t *targa;
|
tex_t *targa;
|
||||||
char *filename;
|
char *filename;
|
||||||
|
@ -258,7 +257,7 @@ Draw_CachePic (const char *path, qboolean alpha)
|
||||||
pic->pic.height = targa->height;
|
pic->pic.height = targa->height;
|
||||||
} else if (!strcmp (path + strlen (path) - 4, ".lmp")) {
|
} else if (!strcmp (path + strlen (path) - 4, ".lmp")) {
|
||||||
// Load the picture..
|
// Load the picture..
|
||||||
dat = (qpic_t *) QFS_LoadTempFile (path);
|
qpic_t *dat = (qpic_t *) QFS_LoadTempFile (path);
|
||||||
if (!dat)
|
if (!dat)
|
||||||
Sys_Error ("Draw_CachePic: failed to load %s", path);
|
Sys_Error ("Draw_CachePic: failed to load %s", path);
|
||||||
|
|
||||||
|
@ -269,7 +268,8 @@ Draw_CachePic (const char *path, qboolean alpha)
|
||||||
false, alpha, 1);
|
false, alpha, 1);
|
||||||
pic->pic.width = dat->width;
|
pic->pic.width = dat->width;
|
||||||
pic->pic.height = dat->height;
|
pic->pic.height = dat->height;
|
||||||
|
if (!strcmp (path, "gfx/menuplyr.lmp"))
|
||||||
|
memcpy (menuplyr_pixels, dat->data, dat->width * dat->height);
|
||||||
} else
|
} else
|
||||||
Sys_Error ("Draw_CachePic: failed to load %s", path);
|
Sys_Error ("Draw_CachePic: failed to load %s", path);
|
||||||
|
|
||||||
|
@ -281,8 +281,6 @@ Draw_CachePic (const char *path, qboolean alpha)
|
||||||
|
|
||||||
// FIXME: A really ugly kluge, keep a specific image in memory
|
// FIXME: A really ugly kluge, keep a specific image in memory
|
||||||
// for the menu system. Some days I really dislike legacy support..
|
// for the menu system. Some days I really dislike legacy support..
|
||||||
if (!strcmp (path, "gfx/menuplyr.lmp"))
|
|
||||||
memcpy (menuplyr_pixels, dat->data, dat->width * dat->height);
|
|
||||||
|
|
||||||
free (filename);
|
free (filename);
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue