/* Project 16 Source Code~\r
- * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover\r
*\r
* This file is part of Project 16.\r
*\r
*\r
*/\r
\r
+//TODO USE CA AND THIS FILE FORMAT\r
+\r
#include "src/lib/16_map.h"\r
+//#define JSMN_STATIC\r
+#include "src/lib/jsmn/jsmn.h"\r
+#include <malloc.h>\r
\r
// Ideally, preprocess json during compilation and read serialized data\r
\r
return -1;\r
}\r
\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
- bitmap_t bp;\r
- #ifdef DEBUG_JS\r
- if(indent==0)\r
- {\r
- fprintf(stdout, "%s\n", js);\r
- fprintf(stdout, "\n");\r
- }\r
- #endif\r
- #ifdef DEBUG_DUMPVARS\r
- fprintf(stdout, "t->size=[%d] ", t->size);\r
- fprintf(stdout, "q=[%d] ", q);\r
- fprintf(stdout, "indent= [%d] ", indent);\r
- fprintf(stdout, "js_sv= [%s]\n", js_sv);\r
- #endif\r
- if (count == 0) {\r
- return 0;\r
- }\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
- FUCK 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
- else\r
- if(strstr(js_sv, "height"))\r
- {\r
- map->height = atoi(js+t->start);\r
- #ifdef DEBUG_MAPVAR\r
- fprintf(stdout, "indent= [%d] ", indent);\r
- fprintf(stdout, "h:[%d]\n", map->height);\r
- #endif\r
- }else if(strstr(js_sv, "width"))\r
- {\r
- map->width = atoi(js+t->start);\r
- #ifdef DEBUG_MAPVAR\r
- fprintf(stdout, "indent= [%d] ", indent);\r
- fprintf(stdout, "w:[%d]\n", map->width);\r
- #endif\r
- }\r
- return 1;\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
-// fprintf(stdout, "[[[[%d|%d]]]]\n", &(t+1)->size, (t+1)->size);\r
-// fprintf(stdout, "\n%.*s[xx[%d|%d]xx]\n", (t+1)->end - (t+1)->start, js+(t+1)->start, &(t+1)->size, (t+1)->size);\r
- map->data = malloc(sizeof(byte) * (t+1)->size);\r
- map->tiles = malloc(sizeof(tiles_t));\r
- map->tiles->btdata = malloc(sizeof(bitmap_t));\r
- //fix this to be far~\r
-//0000 bp = bitmapLoadPcx("data/ed.pcx");\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->height= 16;\r
- map->tiles->tileHeight = 16;\r
- map->tiles->tileWidth = 16;\r
- map->tiles->rows = 1;\r
- map->tiles->cols = 1;\r
-#ifdef __DEBUG_MAP__\r
- dbg_maptext=false;\r
-#endif\r
- strcpy(js_sv, "data");//strdup(js+t->start);//, t->end - t->start);\r
- }\r
- else\r
- if (jsoneq(js, t, "height") == 0 && indent<=1)\r
- {\r
- strcpy(js_sv, "height");//strdup(js+t->start);//, t->end - t->start);\r
- }else\r
- if(jsoneq(js, t, "width") == 0 && indent<=1)\r
- {\r
- strcpy(js_sv, "width");//strdup(js+t->start);//, t->end - t->start);\r
- }else strcpy(js_sv, "\0");\r
- return 1;\r
- } else if (t->type == JSMN_OBJECT) {\r
- //fprintf(stdout, "\n");\r
- j = 0;\r
- for (i = 0; i < t->size; i++) {\r
- //for (k = 0; k < indent; k++) fprintf(stdout, "\t");\r
- j += dump(js, t+1+j, count-j, indent+1, js_sv, map, i);\r
- //fprintf(stdout, ": ");\r
- j += dump(js, t+1+j, count-j, indent+1, js_sv, map, i);\r
- //fprintf(stdout, "\n");\r
- }\r
- return j+1;\r
- } else if (t->type == JSMN_ARRAY) {\r
- j = 0;\r
- //fprintf(stdout, "==\n");\r
- for (i = 0; i < t->size; i++) {\r
- //for (k = 0; k < indent-1; k++) fprintf(stdout, "\t");\r
- //fprintf(stdout, "\t-");\r
- j += dump(js, t+1+j, count-j, indent+1, js_sv, map, i);\r
- //fprintf(stdout, "==\n");\r
- }\r
- return j+1;\r
- }\r
- return 0;\r
-}\r
-\r
-int loadmap(char *mn, map_t *map, global_game_variables_t *gvar)\r
-{\r
- int r;\r
- static word incr=0;\r
- int eof_expected = 0;\r
- char *js = NULL;\r
- size_t jslen = 0;\r
- char buf[BUFSIZ];\r
- static char js_ss[16];\r
-\r
- jsmn_parser p;\r
- jsmntok_t *tok;\r
- size_t tokcount = 2;\r
-\r
- FILE *fh = fopen(mn, "r");\r
-\r
- /* Prepare parser */\r
- jsmn_init(&p);\r
-\r
- /* Allocate some tokens as a start */\r
-//0000fprintf(stderr, "tok malloc\n");\r
- tok = malloc(sizeof(*tok) * tokcount);\r
- if (tok == NULL) {\r
- fprintf(stderr, "malloc(): errno=%d\n", errno);\r
- return 3;\r
- }\r
-\r
- for (;;) {\r
- /* Read another chunk */\r
-//0000fprintf(stderr, "read\n");\r
- r = fread(buf, 1, sizeof(buf), fh);\r
- if (r < 0) {\r
- fprintf(stderr, "fread(): %d, errno=%d\n", r, errno);\r
- return 1;\r
- }\r
- if (r == 0) {\r
- if (eof_expected != 0) {\r
- return 0;\r
- } else {\r
- fprintf(stderr, "fread(): unexpected EOF\n");\r
- return 2;\r
- }\r
- }\r
-//0000fprintf(stdout, "r= [%d] BUFSIZ=%d\n", r, BUFSIZ);\r
-//0000fprintf(stderr, "js alloc~\n");\r
- js = realloc(js, jslen + r + 1);\r
- if (js == NULL) {\r
- fprintf(stderr, "*js=%Fp\n", *js);\r
- fprintf(stderr, "realloc(): errno = %d\n", errno);\r
- return 3;\r
- }\r
- strncpy(js + jslen, buf, r);\r
- jslen = jslen + r;\r
-\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 = jsmn_parse(&p, js, jslen, tok, tokcount);\r
-//0000fprintf(stdout, "r= [%d]\n", r);\r
- if (r < 0) {\r
- if (r == JSMN_ERROR_NOMEM) {\r
- tokcount = tokcount * 2;\r
-//0000fprintf(stderr, "tok realloc~ %zu\n", tokcount);\r
- tok = realloc(tok, sizeof(*tok) * tokcount);\r
- if (tok == NULL) {\r
- fprintf(stderr, "realloc(): errno=%d\n", errno);\r
- return 3;\r
- }\r
- goto again;\r
- }\r
- } else {\r
- //printf("js=%Fp\n", (js));\r
- //printf("*js=%Fp\n", (*(js)));\r
- //printf("&*js=%s\n", &(*(js)));\r
- //printf("&buf=[%Fp]\n", &buf);\r
- //printf("&buf_seg=[%x]\n", FP_SEG(&buf));\r
- //printf("&buf_off=[%x]\n", FP_OFF(&buf));\r
- //printf("&buf_fp=[%Fp]\n", MK_FP(FP_SEG(&buf), FP_OFF(&buf)));\r
- //printf("buf=[\n%s\n]\n", buf);\r
- //printf("buff=[%Fp]\n", buff);\r
- //printf("(*buff)=[%Fp]\n", (*buff));\r
- //printf("&(*buff)=[\n%s\n]\n", &(*buff));\r
- #ifdef DEBUG_DUMPVARS\r
- fprintf(stdout, "running dump~\n");\r
- #endif\r
- dump(js, tok, p.toknext, incr, &js_ss, map, 0);\r
- eof_expected = 1;\r
- }\r
- }\r
-\r
- //free(js);\r
- //free(tok);\r
- //fclose(fh);\r
-\r
- return 0;\r
-}\r
-\r
+//TODO: WORK ON THIS LIKE CRAZY! --sparky4\r
+//FIXME: please FIX THIS AND USE CA! --sparky4\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
+ char *s;\r
+ boolean objlay=0;\r
//bitmap_t bp;\r
\r
i = 0;\r
+#define MAPLNAMESIZE t[i+1].end - t[i+1].start\r
while(i<count) {\r
if(jsoneq(js, &(t[i]), "layers") == 0) {\r
i++;\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
-#ifdef DEBUG_DUMPVARS\r
- printf("t[%d].start=%d, %d\n", i, t[i].start, inner_end);\r
-#endif\r
+//#define DEBUG_DUMPVARS\r
+//#ifdef DEBUG_DUMPVARS\r
+// printf("t[%d].start=%d, %d\n", i, t[i].start, inner_end);\r
+//#endif\r
+ if(!objlay){\r
if(jsoneq(js, &(t[i]), "data") == 0) {\r
#ifdef DEBUG_MAPDATA\r
- printf("Layer %d data: [\n", k);\r
+ printf("Layer %d data: (size is %d)[\n", k, t[i+1].size);\r
#endif\r
- map->layerdata[k] = malloc(sizeof(byte) * t[i+1].size);\r
- map->data = map->layerdata[k];\r
+ map->layerdata[k].data = malloc(sizeof(byte) * t[i+1].size);//TODO: USE MM_ CA_ AND PM_\r
for(j = 0; j < t[i+1].size; j++) {\r
- map->layerdata[k][j] = (byte)atoi(js + t[i+2+j].start);\r
- //for backwards compatibility for rest of code\r
-// map->data[j] = map->layerdata[k][j];//(byte)atoi(js + t[i+2+j].start);//(byte)atoi(js+t->start);\r
+ map->layerdata[k].data[j] = (byte)atoi(js + t[i+2+j].start);\r
#ifdef DEBUG_MAPDATA\r
- //printf("[%d,%d]%d", k, j, map->layerdata[k][j]);\r
- fprintf(stdout, "%c", map->data[j]+44);\r
+ printf("%c", map->layerdata[k].data[j]+44);\r
#endif\r
}\r
i += j + 2;\r
- k++;\r
#ifdef DEBUG_MAPDATA\r
puts("\n]");\r
#endif\r
- }else{\r
- i++;\r
+ }else if(jsoneq(js, &(t[i]), "name") == 0) {\r
+#ifdef DEBUG_MAPVARS\r
+ printf("Layer %d's name: (size is %d)[\n", k, MAPLNAMESIZE);\r
+#endif\r
+ //map->layerdata[k].layername = malloc(sizeof(byte) * MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_\r
+ strncpy(&(map->layerdata[k].layername), js+t[i+1].start, MAPLNAMESIZE);\r
+ if((map->layerdata[k].layername[MAPLNAMESIZE])!=0) map->layerdata[k].layername[MAPLNAMESIZE]='\0';\r
+ if(strstr(&map->layerdata[k].layername, "ob")) objlay=1;\r
+#ifdef DEBUG_MAPDATA\r
+ printf("%s", map->layerdata[k].layername);\r
+ printf("\n]\n");\r
+#endif\r
+ k++;\r
}\r
- }\r
- }\r
+ }else{ //objlay\r
+ if(jsoneq(js, &(t[i]), "objects") == 0) {\r
+#ifdef DEBUG_OBVARS\r
+ printf("objects detected\n");\r
+#endif\r
+#ifdef DEBUG_OBVARS\r
+\r
+#endif\r
+// map->layerdata[k].layername = mAlloc(sizeof(byte) * MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_\r
+// strncpy(map->layerdata[k].layername, js+t[i+1].start, MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_\r
+// if(map->layerdata[k].layername[MAPLNAMESIZE]!=0) map->layerdata[k].layername[MAPLNAMESIZE]='\0';\r
+ }else if(jsoneq(js, &(t[i]), "name") == 0) {\r
+#ifdef DEBUG_OBVARS\r
+ printf("Object %d's name: ", k);//, MAPLNAMESIZE\r
+ printf("'%.*s'\n", t[i+1].end - t[i+1].start, js+t[i+1].start);\r
+#endif\r
+ }else if(jsoneq(js, &(t[i]), "properties") == 0) {\r
+#ifdef DEBUG_OBVARS\r
+ printf(" properties: %.*s\n", t[i+1].end - t[i+1].start, js+t[i+1].start);\r
+#endif\r
+ }else if(jsoneq(js, &(t[i]), "walkable") == 0) {\r
+ printf(" walkable: %d\n", atoi(js + t[i+1].start));\r
+ }\r
+\r
+ }//end objlay\r
+ i++;//next token\r
+ }//tokens\r
+ }//layers\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
- map->layertile[k] = malloc(sizeof(tiles_t));\r
- //Fix to load tileset specified.\r
+ map->tiles = malloc(sizeof(tiles_t));//TODO: USE MM_ CA_ AND PM_\r
+ s = remove_ext((char *)js+t[i+1].start, '.', '/');\r
+ strcpy(map->tiles->imgname, s);\r
//And move to vrs, probably\r
// bp = bitmapLoadPcx("data/ed.pcx");\r
-// map->layertile[k]->btdata = &bp;\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->tiles->btdata = &bp;\r
+ map->tiles->rows = 1;\r
+ map->tiles->cols = 1;\r
#ifdef __DEBUG_MAP__\r
dbg_maptext=false;\r
#endif\r
- map->tiles->btdata = map->layertile[k]->btdata;\r
- map->tiles->tileHeight = 16;\r
- map->tiles->tileWidth = 16;\r
- map->tiles->rows = 1;\r
- map->tiles->cols = 1;\r
- k++;\r
+ i++;\r
+ }else if(jsoneq(js, &(t[i]), "tileheight") == 0) {\r
+ map->tiles->tileHeight = atoi(js + t[i+1].start);\r
+#ifdef DEBUG_MAPVARS\r
+ printf("Tile Height: %d\n", map->tiles->tileHeight);\r
+#endif\r
+ i++;\r
+ }else if(jsoneq(js, &(t[i]), "tilewidth") == 0) {\r
+ map->tiles->tileWidth = atoi(js + t[i+1].start);\r
+#ifdef DEBUG_MAPVARS\r
+ printf("Tile Width: %d\n", map->tiles->tileWidth);\r
+#endif\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_MAPVARS\r
printf("Height: %d\n", map->height);\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_MAPVARS\r
printf("Width: %d\n", map->width);\r
#endif\r
i++;\r
jsmn_init(&p);\r
\r
file_s = filesize(fh);\r
- js = malloc(file_s);\r
+ js = malloc(file_s);//TODO: USE MM_ CA_ AND PM_\r
if(js == NULL) {\r
fprintf(stderr, "malloc(): errno = %d", 2);\r
fclose(fh);\r
return 1;\r
}\r
tokcount = jsmn_parse(&p, js, file_s, NULL, 0);\r
- tok = malloc(tokcount*sizeof(jsmntok_t));\r
+ tok = malloc(tokcount*sizeof(jsmntok_t));//TODO: USE MM_ CA_ AND PM_\r
printf("Allocated %d tokens", tokcount);\r
jsmn_init(&p);\r
if((status = jsmn_parse(&p, js, file_s, tok, tokcount)) < 0)\r
else if(status != tokcount) { printf("Warning: used %d tok\n", status);}\r
extract_map(js, tok, tokcount, map);\r
\r
- free(js);\r
- free(tok);\r
- fclose(fh);\r
+ free(js); //TODO: USE MM_ CA_ AND PM_\r
+ free(tok); //TODO: USE MM_ CA_ AND PM_\r
+ fclose(fh); //TODO: USE MM_ CA_ AND PM_\r
\r
return 0;\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
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
+ CA_LoadFile(mn, MEMPTRCONV MAPSEGINLM, gvar);\r
+ tokcount = jsmn_parse(&p, (char const *)MAPSEGINLM, file_s, NULL, 0);\r
+ tok = malloc(tokcount*sizeof(jsmntok_t));//TODO: USE MM_ CA_ AND PM_\r
// printf("Allocated %d tokens", tokcount);\r
jsmn_init(&p);\r
- if((status = jsmn_parse(&p, MAPBUFINLM, file_s, tok, tokcount)) < 0)\r
+ if((status = jsmn_parse(&p, (char const *)MAPSEGINLM, 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
+ extract_map((char const *)MAPSEGINLM, tok, tokcount, map);\r
\r
- free(tok);\r
- fclose(fh);\r
+// printf("freeing tok\n");\r
+ free(tok); //TODO: USE MM_ CA_ AND PM_\r
+// printf("fclose fh\n");\r
+ fclose(fh); //TODO: USE MM_ CA_ AND PM_\r
\r
return 0;\r
}\r
projects / 16.git / blobdiff