X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fmapread.c;h=7fc94d189f567051bc0d58ca7b7cfffaf1d90463;hb=b6dd51c3b756f09551ea2c731b7aaf370676617a;hp=e3f40b441bbee036658cc132a5a95a89d4a28a17;hpb=3aa2d573c4dace5af78bf8f8f21e46ca36334803;p=16.git diff --git a/src/lib/mapread.c b/src/lib/mapread.c old mode 100644 new mode 100755 index e3f40b44..7fc94d18 --- a/src/lib/mapread.c +++ b/src/lib/mapread.c @@ -76,12 +76,13 @@ word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, bp = bitmapLoadPcx("data/ed.pcx"); map->tiles->data = &bp; //map->tiles->data->data = malloc((16/**2*/)*16); - //map->tiles->data->width = (16/**2*/); - //map->tiles->data->height= 16; - map->tiles->tileHeight = 16; - map->tiles->tileWidth = 16; - map->tiles->rows = 1; + //map->tiles->data->width = (16/**2*/); + //map->tiles->data->height= 16; + map->tiles->tileHeight = 16; + map->tiles->tileWidth = 16; + map->tiles->rows = 1; map->tiles->cols = 1; + map->tiles->debug_text=false; strcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start); } else @@ -127,7 +128,6 @@ int loadmap(char *mn, map_t *map) char *js = NULL; size_t jslen = 0; char buf[BUFSIZ]; -//---- char *buff = &buf; static char js_ss[16]; jsmn_parser p;