X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=bac162c9371df7e9545c9c7e02e3883408bc4355;hb=bee28e8a01c70bae522ef12947c296f837110dbe;hp=3665a650be4ec6e2931059c5da17e0c7c0ae62ba;hpb=22e2009b7f5d8605fd39b011ea6bba405c7ecc0f;p=16.git

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 3665a650..bac162c9 100755
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -20,32 +20,42 @@
  *
  */
 
-#ifndef _LIBMAPREAD_H_
-#define _LIBMAPREAD_H_
+#ifndef _16_MAP__H_
+#define _16_MAP__H_
 
-#include "jsmn/jsmn.h"
-#include "stdio.h"
-#include "stdlib.h"
-#include "src/lib/modex16.h"
 #include "src/lib/16_head.h"
+#include "src/lib/jsmn/jsmn.h"
+//#include "stdio.h" included in 16_head.h
+//#include "stdlib.h" included in 16_head.h
+#include "src/lib/16_vl.h"
+#include "src/lib/16_ca.h"
+#include "src/lib/16_mm.h"
 
+//TODO: 16_mm and 16_ca must handle this
 typedef struct {
-	bitmap_t huge *btdata;
-	planar_buf_t huge *data;
+	bitmap_t huge *btdata;		//old
+	planar_buf_t huge *data;	//old
 	word tileHeight;
 	word tileWidth;
 	unsigned int rows;
 	unsigned int cols;
+	#ifdef __DEBUG__
 	boolean debug_text;	//show the value of the tile! wwww
 	byte *debug_data;
+	#endif
 } tiles_t;
 
+//TODO: 16_mm and 16_ca must handle this
+//TODO: add variables from 16_ca
 typedef struct {
-	byte	**data;
-	tiles_t **tiles;
-	int width;	//this has to be signed!
-	int height;	//this has to be signed!
+	//long		planestart[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
+	unsigned int width, height;		//this has to be positive
+	char		name[16];
 } map_t;
 
 int loadmap(char *mn, map_t *map);
+
 #endif/*_LIBMAPREAD_H_*/