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

Convert GetPCXInfo and GetWalInfo into void functions

Browse source
This commit is contained in:
Yamagi Burmeister 2012-03-12 10:00:07 +00:00
parent 643cb93e5f
commit bb9126ae43
3 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/refresh/files/pcx.c
View file

@ -138,7 +138,7 @@ LoadPCX(char *origname, byte **pic, byte **palette, int *width, int *height)
ri.FS_FreeFile(pcx); ri.FS_FreeFile(pcx);
} }
qboolean void
GetPCXInfo(char *filename, int *width, int *height) GetPCXInfo(char *filename, int *width, int *height)
{ {
pcx_t *pcx; pcx_t *pcx;
@ -148,7 +148,7 @@ GetPCXInfo(char *filename, int *width, int *height)
if (!raw) if (!raw)
{ {
return false; return;
} }
pcx = (pcx_t *)raw; pcx = (pcx_t *)raw;
@ -158,6 +158,6 @@ GetPCXInfo(char *filename, int *width, int *height)
ri.FS_FreeFile(raw); ri.FS_FreeFile(raw);
return true; return;
} }

7
src/refresh/files/wal.c
View file

@ -67,7 +67,7 @@ LoadWal(char *origname)
return image; return image;
} }
qboolean void
GetWalInfo(char *name, int *width, int *height) GetWalInfo(char *name, int *width, int *height)
{ {
miptex_t *mt; miptex_t *mt;
@ -76,13 +76,14 @@ GetWalInfo(char *name, int *width, int *height)
if (!mt) if (!mt)
{ {
return false; return;
} }
*width = LittleLong(mt->width); *width = LittleLong(mt->width);
*height = LittleLong(mt->height); *height = LittleLong(mt->height);
ri.FS_FreeFile((void *)mt); ri.FS_FreeFile((void *)mt);
return true;
return;
} }

4
src/refresh/header/local.h
View file

@ -318,8 +318,8 @@ void LoadPCX ( char *filename, byte **pic, byte **palette, int *width, int *heig
image_t *LoadWal ( char *name ); image_t *LoadWal ( char *name );
void LoadJPG ( char *origname, byte **pic, int *width, int *height ); void LoadJPG ( char *origname, byte **pic, int *width, int *height );
void LoadTGA ( char *origname, byte **pic, int *width, int *height ); void LoadTGA ( char *origname, byte **pic, int *width, int *height );
qboolean GetWalInfo ( char *name, int *width, int *height ); void GetWalInfo ( char *name, int *width, int *height );
qboolean GetPCXInfo ( char *filename, int *width, int *height ); void GetPCXInfo ( char *filename, int *width, int *height );
image_t *R_LoadPic ( char *name, byte *pic, int width, int realwidth, int height, int realheight, imagetype_t type, int bits ); image_t *R_LoadPic ( char *name, byte *pic, int width, int realwidth, int height, int realheight, imagetype_t type, int bits );
image_t *R_FindImage ( char *name, imagetype_t type ); image_t *R_FindImage ( char *name, imagetype_t type );
void R_TextureMode ( char *string ); void R_TextureMode ( char *string );