polished the map reading system~ i made it ... more robust.... now onwards to far...

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

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index eaca2566bc242e049775479ee896062238e4b2aa..f0e07cc8c6493f8ff2d019204d5ccc110b06c1a3 100644 (file)
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -1,16 +1,19 @@
 #ifndef _LIBMAPREAD_H_
 #define _LIBMAPREAD_H_
+//#include <stdlib.h>
+//#include <stdio.h>
 #include <string.h>
 #include <errno.h>
-
-//#include <stdlib.h>
+#include <alloc.h>
 
 #include "src/lib/jsmn/jsmn.h"
 #include "src/lib/modex16.h"
 #include "src/lib/lib_head.h"
 
-//---- temp!
-static char *js_sv;
+//#define DEBUG_MAPDATA
+#define DEBUG_MAPVAR
+//#define DEBUG_DUMPVARS
+#define DEBUG_JS
 
 typedef struct {\r
        bitmap_t *data;
@@ -21,14 +24,14 @@ typedef struct {
 } tiles_t;\r
 \r
 typedef struct {\r
-       byte    *data;\r
+       byte *data;\r
        tiles_t *tiles;\r
-       int width;\r
-       int height;\r
+       unsigned int width;\r
+       unsigned int height;\r
 } 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, map_t *map, int q);
-static int loadmap(char *mn, map_t *map);
+int jsoneq(const char /*far*/ *json, jsmntok_t /*far*/ *tok, const char *s);
+int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent, char *js_sv, map_t *map, int q);
+int loadmap(char *mn, map_t *map);
 
 #endif/*_LIBMAPREAD_H_*/