Don't allow shortcuts with Ctrl+Alt because on Windows they can be used as the AltGr...
[xonotic/darkplaces.git] / wad.h
diff --git a/wad.h b/wad.h
index 87289a7..ac08589 100644 (file)
--- a/wad.h
+++ b/wad.h
@@ -39,22 +39,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 +65,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_UnloadAll(void);
+unsigned char *W_GetLumpName(const char *name, fs_offset_t *returnfilesize);
 
-void   *W_GetLumpName (const char *name);
-
-
-// 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(sizebuf_t *sb); // returns tempmempool allocated image data, width and height are in image_width and image_height
 
 #endif