From 3c748201faa153f88c2810a3766127b5dfe211e6 Mon Sep 17 00:00:00 2001 From: sparky4 Date: Sat, 30 May 2015 08:19:34 -0500 Subject: [PATCH] hmmm why?? wwww modified: maptest.exe modified: maptest.out modified: src/lib/mapread.c --- maptest.exe | Bin 52585 -> 52524 bytes maptest.out | 64 +++++++++++++++++++++++++++++++++++----------- src/lib/mapread.c | 24 +++++++++-------- 3 files changed, 63 insertions(+), 25 deletions(-) diff --git a/maptest.exe b/maptest.exe index 9281777757c32df453a4bc557716882929cb6ea7..b334ba094a297830517b25ccc7c83413e9746a9f 100644 GIT binary patch delta 12020 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 diff --git a/maptest.out b/maptest.out index 86f86e0d..8ae850f4 100644 --- a/maptest.out +++ b/maptest.out @@ -1,16 +1,50 @@ -*js=199e:007b -&buf=[199e:177a] -&buf_seg=[924] -&buf_off=[177a] -&buf_fp=[0924:177a] -buff=[0924:177a] -(*buff)=[199e:000a] -ƉVþFތÒ>è¼ ±Ž^þŠ„Àt1ˆÂˆÃ0ö¸@‰×€ãÓÿ0ÿŠSގ؊Ÿö…ÚuFëՋ^þ‰ò‰Ð‰Ú‰ì]_^Ë1Ò1ÛëðSQR‰Ã¸ +js=0ac4:603e +*js=197e:007b +*js=!¹@¸ -map.width= 4521 -map.height= 4530 -&map==36c1:199e -&map.tiles==36c1:0000 -&map.width==36c1:11a9 -&map.height==36c1:11b2 -&map.data==0924:36c1 +&buf=[197e:175a] +buff=[0922:175a] +(*buff)=[197e:000a] +&(*buff)=[ + + "imagewidth":64, + "margin":0, + "name":"wwww", + "properties": + { + + }, + "spacing":0, + "tileheight":16, + "tilewidth":16 + }], + "tilewidth":16, + "version":1, + "width":40 +}width":40, + "x":0, + "y":0 + }], + "orientation":"orthogonal", + "properties": + { + + }, + "renderorder":"right-down", + "tileheight":16, + "tilesets":[ + { + "firstgid":1, + "image":"ed.png", + "imageheight":64,ýïÿÿ> +] +!¹@¸ + + +map.width= 4489 +map.height= 4498 +&map==36a1:197e +&map.tiles==36a1:0000 +&map.width==36a1:1189 +&map.height==36a1:1192 +&map.data==0922:36a1 diff --git a/src/lib/mapread.c b/src/lib/mapread.c index 8b75a72c..3a6394e7 100644 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -128,7 +128,7 @@ int loadmap(char *mn, map_t *map) char huge *js = NULL; size_t jslen = 0; char buf[BUFSIZ]; - char huge *buff = /*(char huge *)*/&buf;//(char huge *)(MK_FP(FP_SEG(&buf), FP_OFF(&buf)));// + char huge *buff = &buf;//(char huge *)(MK_FP(FP_SEG(&buf), FP_OFF(&buf)));// static char js_ss[16]; jsmn_parser p; @@ -147,7 +147,7 @@ int loadmap(char *mn, map_t *map) return 3; } - //buff = _fmalloc(sizeof(buf)); + //buff = _fmalloc(sizeof(buf[BUFSIZ])); for (;;) { /* Read another chunk */ @@ -164,17 +164,19 @@ int loadmap(char *mn, map_t *map) return 2; } } - buff = /*(char huge *)*/&buf; - js = _frealloc(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; } + //(*buff)=*buf; //printf("strncpy~\n"); //strncpy(jz + jslen, buf, r); - if(_fstrncpy(js + jslen, buff, r) == NULL) - fprintf(stderr, "_fstrncpy(): errno = %d\n", errno); + //if( + _fstrncpy(js + jslen, &(*buff), r); + // == NULL) +// fprintf(stderr, "_fstrncpy(): errno = %d\n", errno); //printf("strncpy okies~~\n"); jslen = jslen + r; @@ -192,15 +194,17 @@ 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_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)); + printf("&(*buff)=[\n%s\n]\n", &(*buff)); dump(js, tok, p.toknext, incr, &js_ss, map, 0); eof_expected = 1; } -- 2.39.5