16_ca needs huge amounts of work and I should remember what needs to be done soon...

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

diff --git a/src/lib/16_tdef.h b/src/lib/16_tdef.h
index 8cb5a7089825febbd9712f3910359b2ee268bcaf..bb886801f6c9d12ca7b82cee2261f6d61b95558d 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -46,22 +46,6 @@
 /*\r
  * typedefs of the game variables!\r
  */\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 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 far *plane[4];     // 4 planes of image data\r
        word width;                     // width of the image (spread across 4 planes)\r
@@ -138,7 +122,7 @@ typedef     struct
        nibble pred;    //prev. direction for animation changing\r
        word dire;              //sprite in use\r
        nibble q;               //loop variable for anumation and locking the playing to compleate the animation cycle to prevent issues with misalignment www\r
-       word speed;             //entity speed!\r
+//     word speed;             //entity speed!\r
        word spt;               //speed per tile\r
 #ifdef __WATCOMC__\r
        sprite_t spri; // sprite used by entity\r
@@ -350,6 +334,8 @@ typedef struct
 {\r
        int profilehandle,debughandle,showmemhandle;\r
        int heaphandle;\r
+       byte datadumpfilename[12];\r
+       byte heapdumpfilename[12];\r
 } loghandle_t;\r
 \r
 typedef struct\r
@@ -457,7 +443,7 @@ typedef struct
        word            bordercolor;\r
        boolean fastpalette;\r
        byte            far     palette1[256][3],far palette2[256][3];\r
-       pictabletype    _seg *pictable;\r
+//???? pictabletype    _seg *pictable;\r
        //keen/cata vars\r
 //     spritetabletype _seg *spritetable;\r
 //     unsigned        *shifttabletable[8];\r
@@ -497,11 +483,12 @@ typedef struct
 //from 16_mm\r
 //==========================================================================\r
 \r
-#define MAXBLOCKS              800             //kd=1300 wolf3d=700 cata=600\r
+#define MAXBLOCKS              1024            //kd=1300 wolf3d=700 cata=600\r
 \r
 typedef struct mmblockstruct\r
 {\r
-       unsigned        start,length;\r
+       //word  start,length,           blob;   //for data larger than 64k\r
+       word    start;  dword length;\r
        unsigned        attributes;\r
        memptr          *useptr;        // pointer to the segment start\r
        struct mmblockstruct far *next;\r
@@ -509,7 +496,7 @@ typedef struct mmblockstruct
 \r
 typedef struct mmshowmemoryinfo\r
 {\r
-       word x,y;\r
+//     unsigned x,y;\r
        mmblocktype far *scan;\r
 } mmshowmemoryinfo_t;\r
 \r
@@ -769,6 +756,7 @@ typedef struct      //TODO: USE THIS!!!!
 \r
        sd_t            sd;\r
        //TODO: extend! and learn from keen/wolf/catacomb's code wwww\r
+       memptr  spribuff[64];   //temp\r
 } ca_t;\r
 \r
 //==========================================================================\r
@@ -798,6 +786,7 @@ typedef struct glob_game_vars
        in_info_t       in;             // 16_in info\r
        player_t        player[MaxPlayers];     // player vars\r
        map_view_t      mv[4];\r
+       map_t           map;\r
 //     sw_t            sw;\r
        boolean DLStarted;\r
 } global_game_variables_t;\r