X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=90eb789be895c0b0423a724b8b91b31d39b7076a;hb=d337fd88c992c80c68263f66a2d22f3ce2ffefa1;hp=28c048c0d1dcce69b52fb171bfa3be8526ca2316;hpb=bcc5413065af54b5895f24f0c89a518146d6d256;p=16.git

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 28c048c0..90eb789b 100755
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -20,33 +20,40 @@
  *
  */
 
-#ifndef _LIBMAPREAD_H_
-#define _LIBMAPREAD_H_
+#ifndef _16_MAP__H_
+#define _16_MAP__H_
 
-#include "jsmn/jsmn.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/modex16.h"
-#include "src/lib/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	* huge *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
+	int width, height;		//this has to be signed!
+	char		name[16];
 } map_t;
 
 int loadmap(char *mn, map_t *map);