X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=wad.h;h=ac085898ab82a5b6646dde6774a31f217fad7c81;hb=086c6c4f1ccdafa4e305eb0903f5570361594c20;hp=cbcdcd6fb958cbad598f477c06e4f62fbbaed24e;hpb=0256e57e16a302ad45090618b8d6eb5930788809;p=xonotic%2Fdarkplaces.git

diff --git a/wad.h b/wad.h
index cbcdcd6f..ac085898 100644
--- a/wad.h
+++ b/wad.h
@@ -8,7 +8,7 @@ of the License, or (at your option) any later version.
 
 This program is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
 See the GNU General Public License for more details.
 
@@ -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,20 +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_LoadWadFile (char *filename);
-void	*W_GetLumpName (char *name);
-
-void SwapPic (qpic_t *pic);
-
-// 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(sizebuf_t *sb); // returns tempmempool allocated image data, width and height are in image_width and image_height
 
 #endif