#include "src/lib/mapread.h"
+/*static void\r
+initMap(map_t *map, int maps) {\r
+ // just a place holder to fill out an alternating pattern\r
+ int x, y;\r
+ int i;\r
+ int tile = 1;\r
+ //if(!isEMS() || !checkEMS())\r
+ map->tiles = malloc(sizeof(tiles_t));\r
+ //else\r
+ // map->tiles = (tiles_t *)alloc_emem(sizeof(tiles_t));\r
+\r
+ // create the tile set\r
+ //if(!isEMS() || !checkEMS())\r
+ map->tiles->data = malloc(sizeof(bitmap_t));\r
+ //else\r
+ // map->tiles->data = (bitmap_t *)alloc_emem(sizeof(bitmap_t));\r
+ map->tiles->data->width = (16*2);\r
+ map->tiles->data->height= 16;\r
+ //if(!isEMS() || !checkEMS())\r
+ map->tiles->data->data = malloc((16*2)*16);\r
+ //else\r
+ // map->tiles->data->data = (byte *)alloc_emem((TILEWH*2)*TILEWH);\r
+ map->tiles->tileHeight = 16;\r
+ map->tiles->tileWidth =16;\r
+ map->tiles->rows = 1;\r
+ map->tiles->cols = 2;\r
+\r
+ //i=0;\r
+ //for(y=0; y<TILEWH; y++) {\r
+ //for(x=0; x<(TILEWH*2); x++) {\r
+ // if(x<TILEWH)\r
+ // map->tiles->data->data[i] = 28;//0x24;\r
+ // else\r
+ // map->tiles->data->data[i] = 0;//0x34;\r
+ // i++;\r
+ //}\r
+ //}\r
+\r
+ i=0;\r
+ for(y=0; y<map->height; y++) {\r
+ for(x=0; x<map->width; x++) {\r
+ map->data[i] = tile;\r
+ tile = tile ? 0 : 1;\r
+ i++;\r
+ }\r
+ tile = tile ? 0 : 1;\r
+ }\r
+}*/
+
static int jsoneq(const char *json, jsmntok_t *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) {
}
//this function is quite messy ^^; sorry! it is a quick and dirty fix~
-static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map) {
+static int dump(const char *js, jsmntok_t *t, size_t count, int indent, /*char *js_sv,*/ map_t *map, int q/*, int w*/) {
int i, j, k;
if (count == 0) {
return 0;
}
/* We may want to do strtol() here to get numeric value */
if (t->type == JSMN_PRIMITIVE) {
+ //if(w)
+ if(js_sv == "data")
+ {
+ /*
+ here we should recursivly call dump again here to skip over the array until we get the facking width of the map.
+ so we can initiate the map which allocates the facking map->tiles->data->data properly and THEN we can return
+ here to read the data.... That is my design for this... wwww
+
+ FUCK well i am stuck.... wwww
+ */
+ //dump(js, t+1, count, indent, map, i);
+
+ //bgdata[q] = strtol(js+t->start, (char **)js+t->end, 10);
+ if(strtol(js+t->start, (char **)js+t->end, 10)==0){ /*printf("%d\n", sizeof(map->tiles->data->data));*/ /*fprintf(stderr, "\nFACK! %d\n", errno);*/ return 1; /*exit(-1); */}
+ map->tiles->data->data[q] = (byte)strtol(js+t->start, (char **)js+t->end, 10);
+ printf("%d[%d]", q, map->tiles->data->data[q]);
+ //printf("%d[%d]", q, bgdata[q]);
+ }
+ else
if(js_sv == "height")
{
map->height = (int)strtol(js+t->start, (char **)js+t->end, 10);
- //printf("h:[%d]\n", map->height);
+ printf("h:[%d]\n", map->height);
}else if(js_sv == "width")
{
map->width = (int)strtol(js+t->start, (char **)js+t->end, 10);
- //printf("w:[%d]\n", map->width);
+ printf("w:[%d]\n", map->width);
}
return 1;
/* We may use strndup() to fetch string value */
} else if (t->type == JSMN_STRING) {
//printf("'%.*s'", t->end - t->start, js+t->start);
+ //if(w)
+ if(jsoneq(js, t, "data") == 0 )
+ {
+ //initMap(&map);
+ //map->tiles->data->data = malloc((16*2)*16);
+ js_sv="data";//strdup(js+t->start);//, t->end - t->start);
+ //printf("%s\n", js_sv);
+ }
+ else
if (jsoneq(js, t, "height") == 0 && indent==1)
{
js_sv="height";//strdup(js+t->start);//, t->end - t->start);
j = 0;
for (i = 0; i < t->size; i++) {
//for (k = 0; k < indent; k++) printf("\t");
- j += dump(js, t+1+j, count-j, indent+1, map);
+ j += dump(js, t+1+j, count-j, indent+1, map, i/*, w*/);
//printf(": ");
- j += dump(js, t+1+j, count-j, indent+1, map);
+ j += dump(js, t+1+j, count-j, indent+1, map, i/*, w*/);
//printf("\n");
}
return j+1;
j = 0;
//printf("==\n");
for (i = 0; i < t->size; i++) {
+ //printf("[[[[%d]]]]\n", t->size);
+ //if(bgdata==NULL) bgdata=malloc(sizeof(char)*t->size);
//for (k = 0; k < indent-1; k++) printf("\t");
//printf("\t-");
- j += dump(js, t+1+j, count-j, indent+1, map);
+ j += dump(js, t+1+j, count-j, indent+1, map, i/*, t->size*/);
//printf("==\n");
}
return j+1;
return 0;
}
-int loadmap(char *mn, map_t *map)
+static int loadmap(char *mn, map_t *map/*, word w*/)
{
int r;
int eof_expected = 0;
js = realloc(js, jslen + r + 1);
if (js == NULL) {
- fprintf(stderr, "realloc(): errno=%d\n", errno);
+ fprintf(stderr, "realloc(): errno = %d\n", errno);
return 3;
}
strncpy(js + jslen, buf, r);
goto again;
}
} else {
- dump(js, tok, p.toknext, 0, map);
+ dump(js, tok, p.toknext, 0, map, 0/*, w*/);
//fprintf(stdout, "[[[[%d]]]]\n", sizeof(tok));
//printf("[\n%d\n]", jslen);
eof_expected = 1;
}
}
+ free(js);
+ free(tok);
+ fclose(fh);
+
return 0;
}
projects / 16.git / blobdiff