qf/quakeforge
0
0
Fork 0
mirror of https://git.code.sf.net/p/quake/quakeforge synced 2025-01-18 23:11:38 +00:00
Code Issues Projects Releases Packages Wiki Activity

PCX: display some information on bad PCX files

Browse source 
also, minor whitespace on <QF/image.h>
This commit is contained in:
Jeff Teunissen 2011-06-14 13:13:33 -04:00
parent cb86e09029
commit 85617586af
2 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
include/QF/image.h
View file

@ -25,10 +25,7 @@
Free Software Foundation, Inc. Free Software Foundation, Inc.
59 Temple Place - Suite 330 59 Temple Place - Suite 330
Boston, MA 02111-1307, USA Boston, MA 02111-1307, USA
$Id$
*/ */
#ifndef __QF_image_h #ifndef __QF_image_h
#define __QF_image_h #define __QF_image_h
@ -52,4 +49,4 @@ typedef struct tex_s {
tex_t *LoadImage (const char *imageFile); tex_t *LoadImage (const char *imageFile);
#endif//__QF_image_h #endif //__QF_image_h

3
libs/image/pcx.c
View file

@ -80,7 +80,8 @@ LoadPCX (QFile *f, qboolean convert, byte *pal)
|| pcx->version != 5 || pcx->version != 5
|| pcx->encoding != 1 || pcx->encoding != 1
|| pcx->bits_per_pixel != 8) { || pcx->bits_per_pixel != 8) {
Sys_Printf ("Bad pcx file\n"); Sys_Printf ("Bad pcx file: %x %d %d %d\n",
pcx->manufacturer, pcx->version, pcx->encoding, pcx->bits_per_pixel);
return 0; return 0;
} }