Merge branch 'master' of github.com:sparky4/16

[16.git] / src / lib / 16_map.h

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 7130e3bc38695e27d366ab9e45c3a64660fb070b..bac162c9371df7e9545c9c7e02e3883408bc4355 100755 (executable)
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -20,14 +20,14 @@
  *\r
  */\r
 \r
-#ifndef _LIBMAPREAD_H_\r
-#define _LIBMAPREAD_H_\r
+#ifndef _16_MAP__H_\r
+#define _16_MAP__H_\r
 \r
-#include "jsmn/jsmn.h"\r
+#include "src/lib/16_head.h"\r
+#include "src/lib/jsmn/jsmn.h"\r
 //#include "stdio.h" included in 16_head.h\r
 //#include "stdlib.h" included in 16_head.h\r
-#include "src/lib/modex16.h"\r
-#include "src/lib/16_head.h"\r
+#include "src/lib/16_vl.h"\r
 #include "src/lib/16_ca.h"\r
 #include "src/lib/16_mm.h"\r
 \r
@@ -39,19 +39,20 @@ typedef struct {
        word tileWidth;\r
        unsigned int rows;\r
        unsigned int cols;\r
-#ifdef __DEBUG__\r
+       #ifdef __DEBUG__\r
        boolean debug_text;     //show the value of the tile! wwww\r
        byte *debug_data;\r
-#endif\r
+       #endif\r
 } tiles_t;\r
 \r
 //TODO: 16_mm and 16_ca must handle this\r
+//TODO: add variables from 16_ca\r
 typedef struct {\r
        //long          planestart[3];\r
-       unsigned        planelength[3];\r
+       //unsigned      planelength[3];\r
        byte    * huge *data;   //TODO: 16_mm and 16_ca must handle this\r
        tiles_t **tiles;                //TODO: 16_mm and 16_ca must handle this\r
-       int width, height;      //this has to be signed!\r
+       unsigned int width, height;             //this has to be positive\r
        char            name[16];\r
 } map_t;\r
 \r