bloody typedefstruct merging is going to be tricky

[16.git] / src / lib / 16_ca.c

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 725e9321e9b6ee3e1414ec9bd5bfe79358c486e6..537e8ba8807c7b83a17fd50d07e5aa981120f46c 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
@@ -1226,10 +1226,9 @@ void CA_Startup(global_game_variables_t *gvar)
 /*\r
        CAL_SetupGrFile ();\r
        CAL_SetupAudioFile ();*/\r
-\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