X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=wad.h;h=87289a7af91a2ca68bec91cb39249035d74db899;hb=7ccb3fb85096674f7bde0d7323946b03c005272a;hp=9c16b566c7f208244f900f897e420e401d35e8cd;hpb=cc3c823ce3baf63d6d8f216c3bf4df88496eb231;p=xonotic%2Fdarkplaces.git

diff --git a/wad.h b/wad.h
index 9c16b566..87289a7a 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.
 
@@ -19,6 +19,9 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */
 // wad.h
 
+#ifndef WAD_H
+#define WAD_H
+
 //===============
 //   TYPES
 //===============
@@ -39,7 +42,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 typedef struct
 {
 	int			width, height;
-	byte		data[4];			// variably sized
+	qbyte		data[4];			// variably sized
 } qpic_t;
 
 
@@ -64,18 +67,15 @@ typedef struct
 
 extern	int			wad_numlumps;
 extern	lumpinfo_t	*wad_lumps;
-extern	byte		*wad_base;
+extern	qbyte		*wad_base;
 
-void	W_LoadWadFile (char *filename);
-void	W_CleanupName (char *in, char *out);
-lumpinfo_t	*W_GetLumpinfo (char *name);
-void	*W_GetLumpName (char *name);
-void	*W_GetLumpNum (int num);
+void	*W_GetLumpName (const 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);
-byte	*W_GetTexture (char *name); // returns malloc'd image data, width and height are in image_width and image_height
-byte	*W_ConvertWAD3Texture(miptex_t *tex); // returns malloc'd image data, width and height are in image_width and image_height
+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
+
+#endif
+