return -1;\r
}\r
\r
-//this function is quite messy ^^; sorry! it is a quick and dirty fix~\r
+/*//this function is quite messy ^^; sorry! it is a quick and dirty fix~\r
word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q) {\r
dword i;\r
word j;//, k;\r
if (count == 0) {\r
return 0;\r
}\r
- /* We may want to do strtol() here to get numeric value */\r
+ // We may want to do strtol() here to get numeric value\r
//0000fprintf(stderr, "t->type=%d\n", t->type);\r
if (t->type == JSMN_PRIMITIVE) {\r
if(strstr(js_sv, "data"))\r
{\r
- /*\r
- here we should recursivly call dump again here to skip over the array until we get the facking width of the map.\r
- so we can initiate the map which allocates the facking map->tiles->data->data properly and THEN we can return\r
- here to read the data.... That is my design for this... wwww\r
+ //\r
+ // here we should recursivly call dump again here to skip over the array until we get the width of the map.\r
+ // so we can initiate the map which allocates the facking map->tiles ->data->data properly and THEN we can return\r
+ // here to read the data.... That is my design for this... wwww\r
\r
- FUCK well i am stuck.... wwww\r
- */\r
+ // well i am stuck.... wwww\r
+ //\r
map->data[q] = (byte)atoi(js+t->start);\r
#ifdef DEBUG_MAPDATA\r
fprintf(stdout, "%d[%d]", q, map->data[q]);\r
#endif\r
}\r
return 1;\r
- /* We may use strndup() to fetch string value */\r
+ // We may use strndup() to fetch string value\r
} else if (t->type == JSMN_STRING) {\r
if(jsoneq(js, t, "data") == 0)\r
{\r
// bp = bitmapLoadPcx("data/koishi^^.pcx");\r
map->tiles->btdata = &bp;\r
//---- map->tiles->data = planar_buf_from_bitmap(&bp);\r
- //map->tiles->data->data = malloc((16/**2*/)*16);\r
- //map->tiles->data->width = (16/**2*/);\r
+ //map->tiles->data->data = malloc((16)*16);\r
+ //map->tiles->data->width = (16/);\r
//map->tiles->data->height= 16;\r
map->tiles->tileHeight = 16;\r
map->tiles->tileWidth = 16;\r
return 0;\r
}\r
\r
-int loadmap(char *mn, map_t *map)\r
+int loadmap(char *mn, map_t *map, global_game_variables_t *gvar)\r
{\r
int r;\r
static word incr=0;\r
\r
FILE *fh = fopen(mn, "r");\r
\r
- /* Prepare parser */\r
+ // Prepare parser\r
jsmn_init(&p);\r
\r
- /* Allocate some tokens as a start */\r
+ // Allocate some tokens as a start\r
//0000fprintf(stderr, "tok malloc\n");\r
tok = malloc(sizeof(*tok) * tokcount);\r
if (tok == NULL) {\r
}\r
\r
for (;;) {\r
- /* Read another chunk */\r
+ // Read another chunk\r
//0000fprintf(stderr, "read\n");\r
r = fread(buf, 1, sizeof(buf), fh);\r
if (r < 0) {\r
again:\r
//0000fprintf(stdout, " parse~ tok=%zu jslen=%zu r=%d _memavl()=%u BUFSIZ=%d~\n", tokcount, jslen, r, _memavl(), BUFSIZ);\r
//0000fprintf(stdout, "p=[%u] [%u] [%d]\n", p.pos, p.toknext, p.toksuper);\r
-/*\r
- 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
-*/\r
+//\r
+// 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
+//\r
r = jsmn_parse(&p, js, jslen, tok, tokcount);\r
//0000fprintf(stdout, "r= [%d]\n", r);\r
if (r < 0) {\r
//fclose(fh);\r
\r
return 0;\r
-}\r
+}*/\r
\r
void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {\r
int i, j, k, indent=0, inner_end;\r
- bitmap_t bp;\r
- //char *s;\r
+ char *s;\r
+ //bitmap_t bp;\r
+\r
i = 0;\r
while(i<count) {\r
if(jsoneq(js, &(t[i]), "layers") == 0) {\r
i++;\r
- map->layerdata = malloc(sizeof(byte*) * t[i].size);\r
+ //map->layerdata = malloc(sizeof(byte*) * t[i].size);\r
inner_end = t[i].end;\r
k = 0;\r
while(t[i].start < inner_end) {\r
- printf("%d, %d\n", t[i].start, inner_end);\r
+#ifdef DEBUG_DUMPVARS\r
+ printf("t[%d].start=%d, %d\n", i, t[i].start, inner_end);\r
+#endif\r
if(jsoneq(js, &(t[i]), "data") == 0) {\r
- #ifdef DEBUG_MAPVAR\r
- printf("Layer %d data: [", k);\r
- #endif\r
- map->layerdata[k] = malloc(sizeof(byte) * t[i+1].size);\r
+#ifdef DEBUG_MAPDATA\r
+ printf("Layer %d data: [\n", k);\r
+#endif\r
+ map->MAPDATAPTK = malloc(sizeof(byte) * t[i+1].size);\r
+ //for backwards compatibility for rest of code\r
+// map->data = map->MAPDATAPTK;\r
for(j = 0; j < t[i+1].size; j++) {\r
- map->layerdata[k][j] = (byte)atoi(js + t[i+2+j].start);\r
- #ifdef DEBUG_MAPVAR\r
- printf("%d, ", map->layerdata[k][j]);\r
- #endif\r
+ map->MAPDATAPTK[j] = (byte)atoi(js + t[i+2+j].start);\r
+#ifdef DEBUG_MAPDATA\r
+ //printf("[%d,%d]%d", k, j, map->MAPDATAPTK[j]);\r
+ fprintf(stdout, "%c", map->data[j]+44);\r
+#endif\r
}\r
i += j + 2;\r
k++;\r
- #ifdef DEBUG_MAPVAR\r
- puts("]");\r
- #endif\r
- }\r
- else{\r
+#ifdef DEBUG_MAPDATA\r
+ puts("\n]");\r
+#endif\r
+ }else{\r
i++;\r
}\r
}\r
}\r
if(jsoneq(js, &(t[i]), "tilesets") == 0) {\r
i++;\r
- map->tiles = malloc(sizeof(tiles_t*) * t[i].size);\r
inner_end = t[i].end;\r
k = 0;\r
while(t[i].start < inner_end) {\r
if(jsoneq(js, &(t[i]), "image") == 0) {\r
- //fix this to be far~\r
- map->layertile[k] = malloc(sizeof(tiles_t));\r
- map->layertile[k]->btdata = malloc(sizeof(bitmap_t));\r
- map->layertile[k]->tileHeight = 16;\r
- map->layertile[k]->tileWidth = 16;\r
- map->layertile[k]->rows = 1;\r
- map->layertile[k]->cols = 1;\r
+ map->MAPTILESPTK = malloc(sizeof(tiles_t));\r
+ s = remove_ext((char *)js+t[i+1].start, '.', '/');\r
+ strcpy(map->MAPTILESPTK->imgname, s);\r
+ //And move to vrs, probably\r
+// bp = bitmapLoadPcx("data/ed.pcx");\r
+// map->MAPTILESPTK->btdata = &bp;\r
+ //map->MAPTILESPTK->btdata = malloc(sizeof(bitmap_t));\r
+ map->MAPTILESPTK->rows = 1;\r
+ map->MAPTILESPTK->cols = 1;\r
#ifdef __DEBUG_MAP__\r
dbg_maptext=false;\r
#endif\r
- //Fix to load tileset specified.\r
- //And move to vrs, probably\r
- //bp = bitmapLoadPcx("data/ed.pcx");\r
- map->layertile[k]->btdata = &bp;\r
- k++;\r
+ i++;\r
+ }else if(jsoneq(js, &(t[i]), "tileheight") == 0) {\r
+ map->MAPTILESPTK->tileHeight = atoi(js + t[i+1].start);\r
+ i++;\r
+ }else if(jsoneq(js, &(t[i]), "tilewidth") == 0) {\r
+ map->MAPTILESPTK->tileWidth = atoi(js + t[i+1].start);\r
+ i++;\r
}\r
i++;\r
+ k++;\r
}\r
}\r
\r
if (jsoneq(js, &(t[i]), "height") == 0 && indent<=1) {\r
map->height = atoi(js + t[i+1].start);\r
- #ifdef DEBUG_MAPVAR\r
+#ifdef DEBUG_MAPVAR\r
printf("Height: %d\n", map->height);\r
- #endif\r
+#endif\r
i++;\r
}\r
else if(jsoneq(js, &(t[i]), "width") == 0 && indent<=1) {\r
map->width = atoi(js + t[i+1].start);\r
- #ifdef DEBUG_MAPVAR\r
+#ifdef DEBUG_MAPVAR\r
printf("Width: %d\n", map->width);\r
- #endif\r
+#endif\r
i++;\r
}\r
i++;\r
\r
return 0;\r
}\r
+\r
+\r
+//======\r
+\r
+\r
+#define MAPBUFINLM (gvar->ca.camap.mapsegs)\r
+int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)\r
+{\r
+ jsmn_parser p;\r
+ jsmntok_t *tok = NULL;\r
+ size_t tokcount, file_s;\r
+\r
+ FILE *fh = fopen(mn, "r");\r
+ int status;\r
+\r
+ /* Prepare parser */\r
+ jsmn_init(&p);\r
+\r
+ file_s = filesize(fh);\r
+ CA_LoadFile(mn, &MAPBUFINLM, gvar);\r
+ tokcount = jsmn_parse(&p, MAPBUFINLM, file_s, NULL, 0);\r
+ tok = malloc(tokcount*sizeof(jsmntok_t));\r
+// printf("Allocated %d tokens", tokcount);\r
+ jsmn_init(&p);\r
+ if((status = jsmn_parse(&p, MAPBUFINLM, file_s, tok, tokcount)) < 0)\r
+ {\r
+ printf("Error: %d\n", status);\r
+ return status;\r
+ }\r
+ else if(status != tokcount) { printf("Warning: used %d tok\n", status);}\r
+ extract_map(MAPBUFINLM, tok, tokcount, map);\r
+\r
+ free(tok);\r
+ fclose(fh);\r
+\r
+ return 0;\r
+}\r
OSDN Git Service
