/* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 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
-#include "16_map.h"\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
+//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, inner_end;\r
- bitmap_t bp;\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->data = 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
+//#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_MAPVAR\r
- printf("Layer %d data: [", k);\r
- #endif\r
- map->data[k] = malloc(sizeof(byte) * t[i+1].size);\r
+#ifdef DEBUG_MAPDATA\r
+ printf("Layer %d data: (size is %d)[\n", k, t[i+1].size);\r
+#endif\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->data[k][j] = (byte)atoi(js + t[i+2+j].start);\r
- #ifdef DEBUG_MAPVAR\r
- printf("%d, ", map->data[k][j]);\r
- #endif\r
+ map->layerdata[k].data[j] = (byte)atoi(js + t[i+2+j].start);\r
+#ifdef DEBUG_MAPDATA\r
+ printf("%c", map->layerdata[k].data[j]+44);\r
+#endif\r
}\r
i += j + 2;\r
+#ifdef DEBUG_MAPDATA\r
+ puts("\n]");\r
+#endif\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
- #ifdef DEBUG_MAPVAR\r
- puts("]");\r
- #endif\r
- }\r
- else{\r
- i++;\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
- //fix this to be far~\r
- map->tiles[k] = malloc(sizeof(tiles_t));\r
- map->tiles[k]->btdata = malloc(sizeof(bitmap_t));\r
- map->tiles[k]->tileHeight = 16;\r
- map->tiles[k]->tileWidth = 16;\r
- map->tiles[k]->rows = 1;\r
- map->tiles[k]->cols = 1;\r
- map->tiles[k]->debug_text=false;\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->tiles[k]->btdata = &bp;\r
- k++;\r
+// bp = bitmapLoadPcx("data/ed.pcx");\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
+ 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
+#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
+#endif\r
i++;\r
}\r
i++;\r
}\r
}\r
\r
-int loadmap(char *mn, map_t *map) {\r
+int newloadmap(char *mn, map_t *map) {\r
char *js;\r
\r
jsmn_parser p;\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
- \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
+\r
+\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, 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, (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((char const *)MAPSEGINLM, tok, tokcount, map);\r
+\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