modified: inputest.exe

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

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index f0e07cc8c6493f8ff2d019204d5ccc110b06c1a3..4f1742468eea4ef867a6e0d45eb2515555361840 100644 (file)
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -4,16 +4,16 @@
 //#include <stdio.h>
 #include <string.h>
 #include <errno.h>
-#include <alloc.h>
+#include <malloc.h>
 
 #include "src/lib/jsmn/jsmn.h"
 #include "src/lib/modex16.h"
-#include "src/lib/lib_head.h"
+#include "src/lib/16_head.h"
 
 //#define DEBUG_MAPDATA
-#define DEBUG_MAPVAR
+//#define DEBUG_MAPVAR
 //#define DEBUG_DUMPVARS
-#define DEBUG_JS
+//#define DEBUG_JS
 
 typedef struct {\r
        bitmap_t *data;
@@ -24,14 +24,14 @@ typedef struct {
 } tiles_t;\r
 \r
 typedef struct {\r
-       byte *data;\r
+       byte    *data;\r
        tiles_t *tiles;\r
-       unsigned int width;\r
-       unsigned int height;\r
+       int width;      //this has to be signed!\r
+       int height;     //this has to be signed!\r
 } map_t;
 
-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 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_*/