gave names to nearly all structs and enums which should make for better C++ error...

[xonotic/darkplaces.git] / wad.h

diff --git a/wad.h b/wad.h
index 001e293f99f81acc059a7c6afb8a3da3227fb1f2..3c3fc511c9fbd9e197ab0f5b2969f0dc019f97cf 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
 //===============
@@ -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
+       qbyte           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,17 +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, int matchwidth, int matchheight); // returns malloc'd image data, width and height are in image_width and image_height (yeah yeah so I'm lazy...)
+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
+