X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=wad.h;h=2aaa1b8d30d92a8525066cdb97cf4d6fc47e540c;hp=3c3fc511c9fbd9e197ab0f5b2969f0dc019f97cf;hb=2b065b3efdf9a5aced95aa93aed4db1caf8191bb;hpb=f9d8bc7ea04ff91fcbd90fe50a299b37724b349b diff --git a/wad.h b/wad.h index 3c3fc511..2aaa1b8d 100644 --- a/wad.h +++ b/wad.h @@ -22,6 +22,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef WAD_H #define WAD_H +#include +struct sizebuf_s; + //=============== // TYPES //=============== @@ -42,7 +45,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. typedef struct qpic_s { int width, height; - qbyte data[4]; // variably sized + unsigned char data[4]; // variably sized } qpic_t; @@ -65,17 +68,13 @@ typedef struct lumpinfo_s char name[16]; // must be null terminated } lumpinfo_t; -extern int wad_numlumps; -extern lumpinfo_t *wad_lumps; -extern qbyte *wad_base; - -void *W_GetLumpName (const char *name); - +void W_UnloadAll(void); +unsigned char *W_GetLumpName(const char *name, int64_t *returnfilesize); -// LordHavoc: added alternate texture WAD2/WAD3 system for easier loading of HalfLife texture wads -void W_LoadTextureWadFile (char *filename, int complain); -qbyte *W_GetTexture (char *name); // returns tempmempool allocated image data, width and height are in image_width and image_height -qbyte *W_ConvertWAD3Texture(miptex_t *tex); // returns tempmempool allocated image data, width and height are in image_width and image_height +// halflife texture wads +void W_LoadTextureWadFile(char *filename, int complain); +unsigned char *W_GetTextureBGRA(char *name); // returns tempmempool allocated image data, width and height are in image_width and image_height +unsigned char *W_ConvertWAD3TextureBGRA(struct sizebuf_s *sb); // returns tempmempool allocated image data, width and height are in image_width and image_height #endif