compiled on 1.9

[16.git] / 16 / modex16 / bitmap.h

diff --git a/16/modex16/bitmap.h b/16/modex16/bitmap.h
index 4c4af98eb04e2cb87502a704cc08966c75b6e712..c25474934ab7e05fffd1115371f712a574c5f86d 100755 (executable)
--- a/16/modex16/bitmap.h
+++ b/16/modex16/bitmap.h
@@ -4,20 +4,42 @@
 #ifndef BITMAP_H\r
 #define BITMAP_H\r
 #include "types.h"\r
+\r
+#ifndef BITMAPT\r
+#define BITMAPT\r
+typedef struct {\r
+       byte *data;\r
+       word width;\r
+       word height;\r
+       byte *palette;\r
+       word offset;\r
+} bitmap_t;\r
+/*\r
 typedef struct {\r
     byte *data;\r
     word width;\r
     word height;\r
     byte *palette;\r
 } bitmap_t;\r
+*/\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
+} tileset_t;\r
+/*\r
 typedef struct {\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
+    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
+#endif\r
 \r
 bitmap_t bitmapLoadPcx(char *filename);\r
 tileset_t bitmapLoadPcxTiles(char *filename, word twidth, word theight);\r