X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=wad.h;h=39dd7df69591004276e4ea66c16297c16bf4bb49;hb=1c341aa1923856369c95aa2be1268f71e4ff65b4;hp=6a20203e659f43a8e53a612d8893351cae866c37;hpb=d57be67cb00229acb8564b92c8b7c58eeed8a0cb;p=xonotic%2Fdarkplaces.git

diff --git a/wad.h b/wad.h
index 6a20203e..39dd7df6 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
 //===============
@@ -36,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;
-	byte		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;
@@ -64,15 +67,15 @@ typedef struct
 
 extern	int			wad_numlumps;
 extern	lumpinfo_t	*wad_lumps;
-extern	byte		*wad_base;
+extern	unsigned char		*wad_base;
 
-void	W_LoadWadFile (char *filename);
-void	*W_GetLumpName (char *name);
+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 tempmempool allocated image data, width and height are in image_width and image_height
-byte	*W_ConvertWAD3Texture(miptex_t *tex); // returns tempmempool allocated image data, width and height are in image_width and image_height
+unsigned char	*W_GetTexture (char *name); // returns tempmempool allocated image data, width and height are in image_width and image_height
+unsigned char	*W_ConvertWAD3Texture(miptex_t *tex); // returns tempmempool allocated image data, width and height are in image_width and image_height
+
+#endif
+