Revert "too tired to continue"

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

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index abd71bdf1b8f888737bd5fe563a990d432322148..38fd2260f04af464ee6acd7144bbd04eb3c6954b 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -67,7 +67,7 @@ typedef struct {
 //TODO: 16_mm and 16_ca must handle this\r
 typedef struct {\r
        bitmap_t far *data;             //old\r
-       //planar_buf_t far *pbdata;     //old\r
+       //planar_buf_t far *data;       //old\r
        word tileHeight, tileWidth;\r
        unsigned int rows, cols;\r
 //     #ifdef __DEBUG__\r
@@ -79,14 +79,30 @@ typedef struct {
 \r
 //TODO: 16_mm and 16_ca must handle this\r
 //TODO: add variables from 16_ca\r
+//#define __NEWMAPTILEDATAVARS__\r
+\r
+#ifdef __NEWMAPTILEDATAVARS__\r
 #define MAPLAYERS 4\r
+#define MAPTILESPTR            layertile[0]\r
+#define MAPTILESPTK            layertile[k]\r
+#define MAPDATAPTR             layerdata[0]\r
+#define MAPDATAPTK             layerdata[k]\r
+#else\r
+#define MAPTILESPTR            tiles//layertile[0]\r
+#define MAPTILESPTK            tiles//layertile[k]\r
+#define MAPDATAPTR             data//layerdata[0]\r
+#define MAPDATAPTK             data//layerdata[k]\r
+#endif\r
 typedef struct {\r
        //long          planestart[3];\r
        //unsigned      planelength[3];\r
+#ifndef __NEWMAPTILEDATAVARS__\r
        byte *data;                     //TODO: 16_mm and 16_ca must handle this\r
+       tiles_t *tiles;         //TODO: 16_mm and 16_ca must handle this\r
+#else\r
        byte * far *layerdata;  //TODO: 16_mm and 16_ca must handle this\r
-       //tiles_t *tiles;               //TODO: 16_mm and 16_ca must handle this\r
        tiles_t far *layertile[MAPLAYERS];      //TODO: 16_mm and 16_ca must handle this\r
+#endif\r
        int width, height;              //this has to be signed!\r
        byte name[16];\r
 } map_t;\r