X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.h;h=4f1742468eea4ef867a6e0d45eb2515555361840;hb=d1ce94441d5e0bffafeb959c505bf3d3975a0a35;hp=26682626b9120cb7a14447233bc08a0df7ab4d74;hpb=cb813c605876f11ce54bee2b44a33e97b00dcf16;p=16.git

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index 26682626..4f174246 100644
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -1,13 +1,19 @@
 #ifndef _LIBMAPREAD_H_
 #define _LIBMAPREAD_H_
-#include <stdlib.h>
+//#include <stdlib.h>
+//#include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include "src/lib/jsmn/jsmn.c"
+#include <malloc.h>
+
+#include "src/lib/jsmn/jsmn.h"
 #include "src/lib/modex16.h"
+#include "src/lib/16_head.h"
 
-char *js_sv;
-byte bgdata[4096];
+//#define DEBUG_MAPDATA
+//#define DEBUG_MAPVAR
+//#define DEBUG_DUMPVARS
+//#define DEBUG_JS
 
 typedef struct {
 	bitmap_t *data;
@@ -20,12 +26,12 @@ typedef struct {
 typedef struct {
 	byte	*data;
 	tiles_t *tiles;
-	int width;
-	int height;
+	int width;	//this has to be signed!
+	int height;	//this has to be signed!
 } map_t;
 
-static int jsoneq(const char *json, jsmntok_t *tok, const char *s);
-static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, int q);
+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);
 
 #endif/*_LIBMAPREAD_H_*/