- Removed Con_SafePrint and Con_SafePrintf since they now does the same things as...

[xonotic/darkplaces.git] / wad.h

diff --git a/wad.h b/wad.h
index 6a20203e659f43a8e53a612d8893351cae866c37..edef176d79ae90f294765e6fa2bc90037a820708 100644 (file)
--- 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,15 +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_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);
-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
+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
+