X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=5cf56c2c0ade0ce15ca97f755570c7d2573c563b;hb=62e514036d73a377dcbc7c8fb1e35807a972179a;hp=bf87c8753c0aa1c14192698beaa715c14bbf3ba3;hpb=f4c6f3f670e78f2d160fcf10f954155797ef67ef;p=16.git

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index bf87c875..5cf56c2c 100755
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -23,39 +23,26 @@
 #ifndef _16_MAP__H_
 #define _16_MAP__H_
 
+#include "src/lib/16_head.h"
+#include "src/lib/16_tdef.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_head.h"
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
+#include "src/lib/16_pm.h"
 
-//TODO: 16_mm and 16_ca must handle this
-typedef struct {
-	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;
+//#define DEBUG_MAPDATA
+//#define DEBUG_MAPVAR
+//#define DEBUG_DUMPVARS
+//#define DEBUG_JS
 
-//TODO: 16_mm and 16_ca must handle this
-//TODO: add variables from 16_ca
-typedef struct {
-	//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;
+//typedefs moved to 16_tdef.h
 
+int jsoneq(const char *json, jsmntok_t *tok, const char *s);
+word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);
 int loadmap(char *mn, map_t *map);
+int newloadmap(char *mn, map_t *map);
 
-#endif/*_LIBMAPREAD_H_*/
+#endif/*_16_LIB__H_*/