From: sparky4 <sparky4@cock.li>
Date: Thu, 8 Sep 2016 16:10:18 +0000 (-0500)
Subject: bloody typedefstruct merging is going to be tricky
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=3025ded8747a2c2d41ab5e7141e771dbdfc7c4d5;p=16.git

bloody typedefstruct merging is going to be tricky
---

diff --git a/src/lib/16_ca.c b/src/lib/16_ca.c
index 537a2f0f..537e8ba8 100755
--- a/src/lib/16_ca.c
+++ b/src/lib/16_ca.c
@@ -1226,7 +1226,6 @@ void CA_Startup(global_game_variables_t *gvar)
 /*
 	CAL_SetupGrFile ();
 	CAL_SetupAudioFile ();*/
-
 	CAL_SetupMapFile (gvar);
 
 	gvar->ca.camap.mapon = -1;
diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 7130e3bc..cd3f9349 100755
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -46,12 +46,13 @@ typedef struct {
 } tiles_t;
 
 //TODO: 16_mm and 16_ca must handle this
+//TODO: add variables from 16_ca
 typedef struct {
 	//long		planestart[3];
-	unsigned	planelength[3];
+	//unsigned	planelength[3];
 	byte	* huge *data;	//TODO: 16_mm and 16_ca must handle this
 	tiles_t **tiles;		//TODO: 16_mm and 16_ca must handle this
-	int width, height;	//this has to be signed!
+	int width, height;		//this has to be signed!
 	char		name[16];
 } map_t;