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

diff --git a/src/lib/mapread.h b/src/lib/mapread.h
index ceef6bb9..4f174246 100644
--- a/src/lib/mapread.h
+++ b/src/lib/mapread.h
@@ -4,14 +4,14 @@
 //#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
 
@@ -24,14 +24,14 @@ typedef struct {
 } tiles_t;
 
 typedef struct {
-	byte far *data;
+	byte	*data;
 	tiles_t *tiles;
-	unsigned int width;
-	unsigned int height;
+	int width;	//this has to be signed!
+	int height;	//this has to be signed!
 } 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_*/