attempted font system added

[16.git] / src / lib / bitmap.h

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