bloody typedefstruct merging is going to be tricky

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 537a2f0f75696446190a90993f1f84cfccf4de3b..537e8ba8807c7b83a17fd50d07e5aa981120f46c 100755 (executable)
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1226,7 +1226,6 @@ void CA_Startup(global_game_variables_t *gvar)
 /*\r
        CAL_SetupGrFile ();\r
        CAL_SetupAudioFile ();*/\r
-\r
        CAL_SetupMapFile (gvar);\r
 \r
        gvar->ca.camap.mapon = -1;\r

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 7130e3bc38695e27d366ab9e45c3a64660fb070b..cd3f934973e594404de32fdfa41701b8ec782d10 100755 (executable)
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -46,12 +46,13 @@ typedef struct {
 } tiles_t;\r
 \r
 //TODO: 16_mm and 16_ca must handle this\r
+//TODO: add variables from 16_ca\r
 typedef struct {\r
        //long          planestart[3];\r
-       unsigned        planelength[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
+       int width, height;              //this has to be signed!\r
        char            name[16];\r
 } map_t;\r
 \r