X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fdarkplaces.git;a=blobdiff_plain;f=wad.h;h=2aaa1b8d30d92a8525066cdb97cf4d6fc47e540c;hp=9283b36b99bf8ca016e357b9543f420a3d98e164;hb=9becec9419d9a20c7d373b14e1106d5f0ce78494;hpb=f9b42aa4394dfa42d48c4dc5e8d39fce776d05dd

diff --git a/wad.h b/wad.h
index 9283b36b..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 <stdint.h>
+struct sizebuf_s;
+
 //===============
 //   TYPES
 //===============
@@ -39,22 +42,22 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #define	TYP_SOUND		67
 #define	TYP_MIPTEX		68
 
-typedef struct
+typedef struct qpic_s
 {
 	int			width, height;
-	qbyte		data[4];			// variably sized
+	unsigned char		data[4];			// variably sized
 } qpic_t;
 
 
 
-typedef struct
+typedef struct wadinfo_s
 {
 	char		identification[4];		// should be WAD2 or 2DAW
 	int			numlumps;
 	int			infotableofs;
 } wadinfo_t;
 
-typedef struct
+typedef struct lumpinfo_s
 {
 	int			filepos;
 	int			disksize;
@@ -65,19 +68,13 @@ typedef struct
 	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 (char *name);
-
-void SwapPic (qpic_t *pic);
+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
-extern int image_width, image_height;
-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