X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fbitmap.h;h=802313d98f1051d6f2060028ccecc5e1339b99e9;hb=f02096268cea5a79cc6a32d2f67831ec50aabdbd;hp=21009dcc3f986f78f693881cdbd197714c2d6dec;hpb=fa22c78a917561d4abf178f8c4f51b9526f665cf;p=16.git

diff --git a/src/lib/bitmap.h b/src/lib/bitmap.h
index 21009dcc..802313d9 100644
--- a/src/lib/bitmap.h
+++ b/src/lib/bitmap.h
@@ -3,22 +3,24 @@
  */
 #ifndef BITMAP_H
 #define BITMAP_H
-#include <malloc.h>
-#include "src/lib/types.h"
+#include "src/lib/types.h"
+#include "src/lib/lib_head.h"
+
 typedef struct {
-    byte far *data;
-    word width;
-    word height;
-    byte *palette;
-    word offset;
+	byte *data;
+	word width;
+	word height;
+	byte *palette;
+	word offset;
+//	byte far *font;
 } bitmap_t;
 
 typedef struct {
-    byte far **data;
-    word ntiles;   /* the number of tiles */
-    word twidth;   /* width of the tiles */
-    word theight;  /* height of the tiles */
-    byte *palette; /* palette for the tile set */
+	byte **data;
+	word ntiles;   /* the number of tiles */
+	word twidth;   /* width of the tiles */
+	word theight;  /* height of the tiles */
+	byte *palette; /* palette for the tile set */
 } tileset_t;
 
 bitmap_t bitmapLoadPcx(char *filename);