X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=wad.h;h=39dd7df69591004276e4ea66c16297c16bf4bb49;hb=41f1138b4a171ebb11be1418ed5579a8935b5516;hp=edef176d79ae90f294765e6fa2bc90037a820708;hpb=95f66338c8144989970daa0fa4b38c87e9af94a0;p=xonotic%2Fdarkplaces.git diff --git a/wad.h b/wad.h index edef176d..39dd7df6 100644 --- a/wad.h +++ b/wad.h @@ -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; @@ -67,15 +67,15 @@ typedef struct extern int wad_numlumps; extern lumpinfo_t *wad_lumps; -extern qbyte *wad_base; +extern unsigned char *wad_base; -void *W_GetLumpName (char *name); +void *W_GetLumpName (const char *name); // LordHavoc: added alternate texture WAD2/WAD3 system for easier loading of HalfLife texture wads 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 +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