bloody typedefstruct merging is going to be tricky

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 725e9321e9b6ee3e1414ec9bd5bfe79358c486e6..537a2f0f75696446190a90993f1f84cfccf4de3b 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -46,10 +46,10 @@ loaded into the data segment
 =============================================================================\r
 */\r
 \r
-typedef struct\r
+/*typedef struct\r
 {\r
   word bit0,bit1;      // 0-255 is a character, > is a pointer to a node\r
-} huffnode;\r
+} huffnode;*/\r
 \r
 \r
 /*typedef struct\r
@@ -1229,7 +1229,7 @@ void CA_Startup(global_game_variables_t *gvar)
 \r
        CAL_SetupMapFile (gvar);\r
 \r
-       gvar->ca.map.mapon = -1;\r
+       gvar->ca.camap.mapon = -1;\r
        gvar->ca.ca_levelbit = 1;\r
        gvar->ca.ca_levelnum = 0;\r
 \r

diff --git a/src/lib/16_ca.h b/src/lib/16_ca.h
index 5d8675ca887e2cb53ec5d08939516a686bde0d70..41649dbfd8a244095e76903347435fb4906f6ca1 100755 (executable)
--- a/src/lib/16_ca.h
+++ b/src/lib/16_ca.h
@@ -41,6 +41,13 @@
 \r
 //===========================================================================\r
 \r
+/*typedef struct\r
+{\r
+       unsigned        RLEWtag;\r
+       long            headeroffsets[100];\r
+       byte            tileinfo[];\r
+} mapfiletype;*/\r
+\r
 /*typedef      struct\r
 {\r
        long            planestart[3];\r

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 28c048c0d1dcce69b52fb171bfa3be8526ca2316..7130e3bc38695e27d366ab9e45c3a64660fb070b 100755 (executable)
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -31,22 +31,28 @@
 #include "src/lib/16_ca.h"\r
 #include "src/lib/16_mm.h"\r
 \r
+//TODO: 16_mm and 16_ca must handle this\r
 typedef struct {\r
-       bitmap_t huge *btdata;\r
-       planar_buf_t huge *data;\r
+       bitmap_t huge *btdata;          //old\r
+       planar_buf_t huge *data;        //old\r
        word tileHeight;\r
        word tileWidth;\r
        unsigned int rows;\r
        unsigned int cols;\r
+#ifdef __DEBUG__\r
        boolean debug_text;     //show the value of the tile! wwww\r
        byte *debug_data;\r
+#endif\r
 } tiles_t;\r
 \r
+//TODO: 16_mm and 16_ca must handle this\r
 typedef struct {\r
-       byte    * huge *data;\r
-       tiles_t **tiles;\r
-       int width;      //this has to be signed!\r
-       int height;     //this has to be signed!\r
+       //long          planestart[3];\r
+       unsigned        planelength[3];\r
+       byte    * huge *data;   //TODO: 16_mm and 16_ca must handle this\r
+       tiles_t **tiles;                //TODO: 16_mm and 16_ca must handle this\r
+       int width, height;      //this has to be signed!\r
+       char            name[16];\r
 } map_t;\r
 \r
 int loadmap(char *mn, map_t *map);\r

diff --git a/src/lib/typdefst.h b/src/lib/typdefst.h
index 70012de8fbd730a9320a8f9de054cd86b7bd3c5e..5323222e8c203ce7a39e283d715ae7d3ce06844f 100755 (executable)
--- a/src/lib/typdefst.h
+++ b/src/lib/typdefst.h
@@ -186,24 +186,29 @@ typedef struct
 #define NUMMAPS                4//39\r
 #define MAPPLANES              3\r
 \r
+typedef struct\r
+{\r
+  word bit0,bit1;      // 0-255 is a character, > is a pointer to a node\r
+} huffnode;\r
+\r
 typedef struct\r
 {\r
        int             mapon, mapnum;\r
        __segment       *mapsegs[4];\r
        __segment       *mapheaderseg[NUMMAPS];\r
        __segment       *tinf;\r
-} mapinfo_t;\r
+} ca_mapinfo_t;\r
 \r
 typedef struct\r
 {\r
        int                     maphandle[4];           // handle to MAPTEMP / GAMEMAPS\r
-} handle_t;\r
+} ca_handle_t;\r
 \r
 typedef struct\r
 {\r
        byte            ca_levelbit,ca_levelnum;\r
-       handle_t        file;           //files to open\r
-       mapinfo_t       map;\r
+       ca_handle_t     file;           //files to open\r
+       ca_mapinfo_t    camap;\r
        //_seg  *grsegs[NUMCHUNKS];\r
        //byte          far     grneeded[NUMCHUNKS];\r
        //huffnode huffnode;\r