}
//this function is quite messy ^^; sorry! it is a quick and dirty fix~
-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;
+word dump(const char huge *js, jsmntok_t huge *t, size_t count, word indent, char *js_sv, map_t *map, unsigned long q) {
+ unsigned long i;
+ word j;//, k;
bitmap_t bp;
#ifdef DEBUG_JS
if(indent==0)
}
#endif
#ifdef DEBUG_DUMPVARS
+ fprintf(stdout, "t->size=[%d] ", t->size);
+ fprintf(stdout, "q=[%d] ", q);
fprintf(stdout, "indent= [%d] ", indent);
fprintf(stdout, "js_sv= [%s]\n", js_sv);
#endif
return 0;
}
/* We may want to do strtol() here to get numeric value */
+//0000fprintf(stderr, "t->type=%d\n", t->type);
if (t->type == JSMN_PRIMITIVE) {
if(_fstrstr(js_sv, "data"))
{
map->tiles = /*_f*/malloc(sizeof(tiles_t));
//map->tiles->data = malloc(sizeof(bitmap_t));
//fix this to be far~
- bp = bitmapLoadPcx("data/ed.pcx");
- map->tiles->data = &bp;
+//++++ bp = bitmapLoadPcx("data/ed.pcx");
+//++++ map->tiles->data = &bp;
//map->tiles->data->data = malloc((16/**2*/)*16);
//map->tiles->data->width = (16/**2*/);\r
//map->tiles->data->height= 16;\r
int loadmap(char *mn, map_t *map)
{
int r;
- static int incr=0;
+ static word incr=0;
int eof_expected = 0;
char huge *js = NULL;
size_t jslen = 0;
jsmn_init(&p);
/* Allocate some tokens as a start */
+//0000fprintf(stderr, "tok malloc\n");
tok = _fmalloc(sizeof(*tok) * tokcount);
if (tok == NULL) {
fprintf(stderr, "malloc(): errno=%d\n", errno);
for (;;) {
/* Read another chunk */
+//0000fprintf(stderr, "read\n");
r = fread(buf, 1, sizeof(buf), fh);
if (r < 0) {
fprintf(stderr, "fread(): %d, errno=%d\n", r, errno);
return 2;
}
}
+//0000fprintf(stdout, "r= [%d] BUFSIZ=%d\n", r, BUFSIZ);
+//0000fprintf(stderr, "js alloc~\n");
js = _frealloc(js, jslen + r + 1);
if (js == NULL) {
fprintf(stderr, "*js=%Fp\n", *js);
jslen = jslen + r;
again:
+//0000fprintf(stdout, " parse~ tok=%zu jslen=%zu r=%d _memavl()=%u BUFSIZ=%d~\n", tokcount, jslen, r, _memavl(), BUFSIZ);
+//0000fprintf(stdout, "p=[%u] [%u] [%d]\n", p.pos, p.toknext, p.toksuper);
+/*
+ I think it crashes on the line below when it tries to parse the data of huge maps... wwww this is a jsmn problem wwww
+*/
+//++++
r = jsmn_parse(&p, js, jslen, tok, tokcount);
+//0000fprintf(stdout, "r= [%d]\n", r);
if (r < 0) {
if (r == JSMN_ERROR_NOMEM) {
tokcount = tokcount * 2;
+//0000fprintf(stderr, "tok realloc~ %zu\n", tokcount);
tok = _frealloc(tok, sizeof(*tok) * tokcount);
if (tok == NULL) {
fprintf(stderr, "realloc(): errno=%d\n", errno);
} else {
//printf("js=%Fp\n", (js));
//printf("*js=%Fp\n", (*(js)));
- //printf("&*js=%s\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("buff=[%Fp]\n", buff);
//printf("(*buff)=[%Fp]\n", (*buff));
//printf("&(*buff)=[\n%s\n]\n", &(*buff));
+ #ifdef DEBUG_DUMPVARS
+ fprintf(stdout, "running dump~\n");
+ #endif
+//++++
dump(js, tok, p.toknext, incr, &js_ss, map, 0);
eof_expected = 1;
}