keysym2ucs: Delete. Was only used for the GLX client which no longer exists

[xonotic/darkplaces.git] / wad.h

diff --git a/wad.h b/wad.h
index edef176d79ae90f294765e6fa2bc90037a820708..2aaa1b8d30d92a8525066cdb97cf4d6fc47e540c 100644 (file)
--- 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,17 +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 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