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 cd94df84bdc09fa1df7fe30baf57317706ca1fdf..a1a293925ace89e4aa60372dfbc3a557b6257e03 100755 (executable)
--- a/src/lib/16_tdef.h
+++ b/src/lib/16_tdef.h
@@ -84,6 +84,8 @@ typedef struct vrs_container{
        };\r
        // Array of corresponding vrl line offsets\r
        vrl1_vgax_offset_t **vrl_line_offsets;\r
+       //sprite buffer\r
+       byte far _seg *spribuff;\r
 } vrs_container_t;\r
 \r
 typedef struct vrl_container{\r
@@ -96,6 +98,8 @@ typedef struct vrl_container{
        };\r
        // Pointer to a corresponding vrl line offsets struct\r
        vrl1_vgax_offset_t *line_offsets;\r
+       //sprite buffer\r
+       byte far _seg *spribuff;\r
 } vrl_container_t;\r
 \r
 typedef struct sprite\r
@@ -673,12 +677,12 @@ typedef struct
 //==========================================================================\r
 \r
 #define NOMAPS\r
-//#define NOGRAPHICS\r
+#define NOGRAPHICS\r
 #define NOAUDIO\r
 \r
-#define MAPHEADERLINKED\r
+//#define MAPHEADERLINKED\r
 //#define GRHEADERLINKED\r
-#define AUDIOHEADERLINKED\r
+//#define AUDIOHEADERLINKED\r
 \r
 #define NUMMAPS                4//39\r
 #define NUMSNDCHUNKS           4//3\r
@@ -692,9 +696,12 @@ typedef struct
 #define GDICTNAME      DATADIR"vgadict."\r
 #define GHEADNAME      DATADIR"vgahead."\r
 #define GFILENAME      DATADIR"vgagraph."\r
-#define EXTENSION      "hb1"\r
 \r
 \r
+#define MAPSEGBUF      mapsegs\r
+#define MAPSEGPTR      MAPSEGBUF[0]\r
+#define MAPSEGINLM     (gvar->ca.MAPSEGPTR)\r
+\r
 typedef struct\r
 {\r
   word bit0,bit1;      // 0-255 is a character, > is a pointer to a node\r
@@ -710,9 +717,10 @@ typedef    struct
 \r
 typedef struct\r
 {\r
-       int             mapon, mapnum;\r
-       maptype         _seg    *mapheaderseg[NUMMAPS];\r
-} ca_mapinfo_t;\r
+       unsigned        RLEWtag;\r
+       long            headeroffsets[100];\r
+       byte            tileinfo[];\r
+} mapfiletype;\r
 \r
 typedef struct\r
 {\r
@@ -733,9 +741,10 @@ typedef struct     //TODO: USE THIS!!!!
 {\r
        byte    ca_levelbit,ca_levelnum;\r
        ca_handle_t             file;           //files to open\r
-       ca_mapinfo_t    camap;\r
 \r
        byte            _seg    *tinf;//?? where in the id engine is this used and what is it? --sparky4\r
+       int             mapon, mapnum;\r
+       maptype         _seg    *mapheaderseg[NUMMAPS];\r
        unsigned        _seg    *mapsegs[MAPPLANES];\r
        void            _seg    *grsegs[NUMCHUNKS];\r
        byte            far             grneeded[NUMCHUNKS];\r
@@ -760,7 +769,6 @@ typedef struct      //TODO: USE THIS!!!!
 \r
        sd_t            sd;\r
        //TODO: extend! and learn from keen/wolf/catacomb's code wwww\r
-       memptr  spribuff;\r
 } ca_t;\r
 \r
 //==========================================================================\r