X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=bac162c9371df7e9545c9c7e02e3883408bc4355;hb=989f287818c93cf9b1ff96c13e66720571210513;hp=7130e3bc38695e27d366ab9e45c3a64660fb070b;hpb=9676e77f1f4ed81097fa84609c6cf6611913e9ce;p=16.git

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 7130e3bc..bac162c9 100755
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -20,14 +20,14 @@
  *
  */
 
-#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"
 
@@ -39,19 +39,20 @@ typedef struct {
 	word tileWidth;
 	unsigned int rows;
 	unsigned int cols;
-#ifdef __DEBUG__
+	#ifdef __DEBUG__
 	boolean debug_text;	//show the value of the tile! wwww
 	byte *debug_data;
-#endif
+	#endif
 } 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!
+	unsigned int width, height;		//this has to be positive
 	char		name[16];
 } map_t;