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 9a225c8fb23b8a525c1bdb0230c802ac563e9b73..38fd2260f04af464ee6acd7144bbd04eb3c6954b 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -66,30 +66,47 @@ typedef struct {
 \r
 //TODO: 16_mm and 16_ca must handle this\r
 typedef struct {\r
-       bitmap_t far *btdata;           //old\r
-       planar_buf_t far *data; //old\r
+       bitmap_t far *data;             //old\r
+       //planar_buf_t far *data;       //old\r
        word tileHeight, tileWidth;\r
        unsigned int rows, cols;\r
 //     #ifdef __DEBUG__\r
 //     boolean debug_text;     //show the value of the tile! wwww\r
 //     byte *debug_data;\r
 //     #endif\r
+       byte    imgname[8];             //image file of tileset\r
 } tiles_t;\r
 \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
-       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;       //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 far *layertile[MAPLAYERS];      //TODO: 16_mm and 16_ca must handle this\r
+#endif\r
        int width, height;              //this has to be signed!\r
-       char            name[16];\r
+       byte name[16];\r
 } map_t;\r
 \r
-//TODO USE THIS tile info\r
 typedef struct{\r
        word tw;                /* screen width in tiles */\r
        word th;                /* screen height in tiles */\r
@@ -114,6 +131,7 @@ typedef struct {
        word stridew;                   /* width/4 */   /* VGA */\r
        word pagesize;                  /* page size */\r
        word pi;                                /* increment page by this much to preserve location */\r
+       int tlx,tly;\r
 //newer vars\r
 //TODO: find where they are used\r
        sword delta;                    // How much should we shift the page for smooth scrolling\r
@@ -279,11 +297,12 @@ typedef struct
        byte vga_draw_stride;\r
        byte vga_draw_stride_limit;             // further X clipping\r
        //end of doslib origi vars\r
-       boolean __near rss;                     //render sprite switch\r
+       boolean __near rss;             //render sprite switch\r
+       boolean __near bgps;            //bg preservation render switch between old and new\r
        sword __near sprifilei;         //player file's i\r
        nibble __near p;                        //render page number\r
        nibble __near sp;                       //show page number(for showpage)\r
-       boolean __near r;                       //page flip, showpage, or render        if true\r
+       boolean __near dorender;        //page flip, showpage, or render        if true\r
        word pr[MAXPAGE][4];    //render sections of pages (this is supposed to be set up to draw sections of the screen if updated)\r
 \r
        nibble sfip;            //shinku_fps_indicator_page; // we're on page 1 now, shinku(). follow along please or it will not be visible.\r
@@ -493,9 +512,10 @@ typedef struct
 typedef struct\r
 {\r
        int             mapon, mapnum;\r
-       __SEGA  *mapsegs[4];\r
-       __SEGA  *mapheaderseg[NUMMAPS];\r
-       __SEGA  *tinf;\r
+       //__SEGA        *mapsegs[4];\r
+       //__SEGA        *mapheaderseg[NUMMAPS];\r
+       //__SEGA        *tinf;\r
+       memptr  mapsegs;\r
 } ca_mapinfo_t;\r
 \r
 typedef struct\r
@@ -539,6 +559,7 @@ typedef struct
 \r
 #ifdef __WATCOMC__\r
 extern char global_temp_status_text[512];\r
+extern char global_temp_status_text2[512];\r
 #define EINVFMT EMFILE\r
 #endif\r
 #endif /* _TYPEDEFSTRUCT_H_ */\r