X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=3a6394e76dd547714425560159b3466a31914665;hb=3c748201faa153f88c2810a3766127b5dfe211e6;hp=36169f951ecfb0acfff4cfe1fdf7733d7cf337dc;hpb=5a58cbe2fbb89c31abbb46b23d6bfc6d2765cca5;p=16.git

diff --git a/src/lib/mapread.c b/src/lib/mapread.c
index 36169f95..3a6394e7 100644
--- a/src/lib/mapread.c
+++ b/src/lib/mapread.c
@@ -1,15 +1,15 @@
 #include "src/lib/mapread.h"
 
-int jsoneq(const char /*far*/ *json, jsmntok_t /*far*/ *tok, const char *s) {
+int jsoneq(const char huge *json, jsmntok_t huge *tok, const char *s) {
 	if (tok->type == JSMN_STRING && (int) strlen(s) == tok->end - tok->start &&
-			strncmp(json + tok->start, s, tok->end - tok->start) == 0) {
+			strncmp((char const near *)json + tok->start, s, tok->end - tok->start) == 0) {
 		return 0;
 	}
 	return -1;
 }
 
 //this function is quite messy ^^; sorry! it is a quick and dirty fix~
-int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent, char *js_sv, map_t *map, int q) {
+int dump(const char huge *js, jsmntok_t huge *t, size_t count, int indent, char *js_sv, map_t *map, int q) {
 	int i, j, k;
 	bitmap_t bp;
 	#ifdef DEBUG_JS
@@ -38,7 +38,7 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent,
 				FUCK well i am stuck.... wwww
 			*/
 //----			map->data[q] = (byte)strtol(js+t->start, (char **)t->end, 10);
-			map->data[q] = (byte)atoi(js+t->start);
+			map->data[q] = (byte)atoi((const char *)js+t->start);
 			#ifdef DEBUG_MAPDATA
 				fprintf(stdout, "%d[%d]", q, map->data[q]);
 			#endif
@@ -47,7 +47,7 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent,
 		if(strstr(js_sv, "height"))
 		{
 //----			map->height = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
-			map->height = (unsigned int)atoi(js+t->start);
+			map->height = atoi((const char *)js+t->start);
 			#ifdef DEBUG_MAPVAR
 			fprintf(stdout, "indent= [%d]	", indent);
 			fprintf(stdout, "h:[%d]\n", map->height);
@@ -55,7 +55,7 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent,
 		}else if(strstr(js_sv, "width"))
 		{
 //----			map->width = (unsigned int)strtol(js+t->start, (char **)js+t->end, 10);
-			map->width = (unsigned int)atoi(js+t->start);
+			map->width = atoi((const char *)js+t->start);
 			#ifdef DEBUG_MAPVAR
 			fprintf(stdout, "indent= [%d]	", indent);
 			fprintf(stdout, "w:[%d]\n", map->width);
@@ -68,7 +68,8 @@ int dump(const char /*far*/ *js, jsmntok_t /*far*/ *t, size_t count, int indent,
 		{
 //			fprintf(stdout, "[[[[%d|%d]]]]\n", &(t+1)->size, (t+1)->size);
 //			fprintf(stdout, "\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size);
-			map->data = _fmalloc(sizeof(byte) * (t+1)->size);
+			map->data = halloc(sizeof(byte) * (t+1)->size, sizeof(byte));
+			//map->data = malloc(sizeof(byte) * (t+1)->size);
 			map->tiles = /*_f*/malloc(sizeof(tiles_t));
 			//map->tiles->data = malloc(sizeof(bitmap_t));
 			//fix this
@@ -123,13 +124,15 @@ int loadmap(char *mn, map_t *map)
 	int r;
 	static int incr=0;
 	int eof_expected = 0;
-	char /*far*/ *js = NULL;
+	//char *jz = NULL;
+	char huge *js = NULL;
 	size_t jslen = 0;
 	char buf[BUFSIZ];
+	char huge *buff = &buf;//(char huge *)(MK_FP(FP_SEG(&buf), FP_OFF(&buf)));//
 	static char js_ss[16];
 
 	jsmn_parser p;
-	jsmntok_t /*far*/ *tok;
+	jsmntok_t huge *tok;
 	size_t tokcount = 2;
 
 	FILE *fh = fopen(mn, "r");
@@ -138,12 +141,14 @@ int loadmap(char *mn, map_t *map)
 	jsmn_init(&p);
 
 	/* Allocate some tokens as a start */
-	tok = /*_f*/malloc(sizeof(*tok) * tokcount);
+	tok = _fmalloc(sizeof(*tok) * tokcount);
 	if (tok == NULL) {
 		fprintf(stderr, "malloc(): errno=%d\n", errno);
 		return 3;
 	}
 
+	//buff = _fmalloc(sizeof(buf[BUFSIZ]));
+
 	for (;;) {
 		/* Read another chunk */
 		r = fread(buf, 1, sizeof(buf), fh);
@@ -159,21 +164,29 @@ int loadmap(char *mn, map_t *map)
 				return 2;
 			}
 		}
-
-		js = /*_f*/realloc(js, jslen + r + 1);
+		js = _frealloc(js, jslen + r + 1);
 		if (js == NULL) {
+			fprintf(stderr, "*js=%Fp\n", *js);
 			fprintf(stderr, "realloc(): errno = %d\n", errno);
 			return 3;
 		}
-		strncpy(js + jslen, buf, r);
+		//(*buff)=*buf;
+		//printf("strncpy~\n");
+		//strncpy(jz + jslen, buf, r);
+		//if(
+		_fstrncpy(js + jslen, &(*buff), r);
+		// == NULL)
+//			fprintf(stderr, "_fstrncpy(): errno = %d\n", errno);
+		//printf("strncpy okies~~\n");
 		jslen = jslen + r;
 
 again:
+		//printf("(*js)=%Fp\n", (*js));
 		r = jsmn_parse(&p, js, jslen, tok, tokcount);
 		if (r < 0) {
 			if (r == JSMN_ERROR_NOMEM) {
 				tokcount = tokcount * 2;
-				tok = /*_f*/realloc(tok, sizeof(*tok) * tokcount);
+				tok = _frealloc(tok, sizeof(*tok) * tokcount);
 				if (tok == NULL) {
 					fprintf(stderr, "realloc(): errno=%d\n", errno);
 					return 3;
@@ -181,13 +194,24 @@ again:
 				goto again;
 			}
 		} else {
+			printf("js=%Fp\n", js);
+			printf("*js=%Fp\n", (*js));
+			printf("*js=%s\n", &(*js));
+			printf("&buf=[%Fp]\n", &buf);
+			//printf("&buf_seg=[%x]\n", FP_SEG(&buf));
+			//printf("&buf_off=[%x]\n", FP_OFF(&buf));
+			//printf("&buf_fp=[%Fp]\n", MK_FP(FP_SEG(&buf), FP_OFF(&buf)));
+			//printf("buf=[\n%s\n]\n", buf);
+			printf("buff=[%Fp]\n", buff);
+			printf("(*buff)=[%Fp]\n", (*buff));
+			printf("&(*buff)=[\n%s\n]\n", &(*buff));
 			dump(js, tok, p.toknext, incr, &js_ss, map, 0);
 			eof_expected = 1;
 		}
 	}
 
-	/*_f*/free(js);
-	/*_f*/free(tok);
+	hfree(js);
+	hfree(tok);
 	fclose(fh);
 
 	return 0;