X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.h;h=ceef6bb96c12d8a72791cad1ad33a20f8226c035;hb=5a58cbe2fbb89c31abbb46b23d6bfc6d2765cca5;hp=dbb4bfa34b1be7571e0c96b601ab13aada647c84;hpb=47de84fccfcf27e3cf83004b74eee1215284c5df;p=16.git

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index dbb4bfa3..ceef6bb9 100644
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -1,14 +1,19 @@
 #ifndef _LIBMAPREAD_H_
 #define _LIBMAPREAD_H_
-#include <stdlib.h>
-#include <stdio.h>
+//#include <stdlib.h>
+//#include <stdio.h>
 #include <string.h>
 #include <errno.h>
+#include <alloc.h>
+
 #include "src/lib/jsmn/jsmn.h"
 #include "src/lib/modex16.h"
+#include "src/lib/lib_head.h"
 
-static char *js_sv;
-//byte bgdata[4096];
+//#define DEBUG_MAPDATA
+#define DEBUG_MAPVAR
+//#define DEBUG_DUMPVARS
+//#define DEBUG_JS
 
 typedef struct {
 	bitmap_t *data;
@@ -19,14 +24,14 @@ typedef struct {
 } tiles_t;
 
 typedef struct {
-	byte	*data;
+	byte far *data;
 	tiles_t *tiles;
-	int width;
-	int height;
+	unsigned int width;
+	unsigned int height;
 } 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/*, word w*/);
-static int loadmap(char *mn, map_t *map/*, word w*/);
+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_*/