X-Git-Url: http://4ch.mooo.com/gitweb/?p=16.git;a=blobdiff_plain;f=src%2Flib%2F16_map.c;h=33c27d1446fb98d81c362e15519466160c1bd331;hp=1afb7bc8efe47dd95941e9ecc1cada52d1e47fef;hb=def418b6ee7f06ce7229e6eae5dbfbe44e9b9e82;hpb=fb900d77df687bfa549995e15a762017c381e552 diff --git a/src/lib/16_map.c b/src/lib/16_map.c index 1afb7bc8..33c27d14 100755 --- a/src/lib/16_map.c +++ b/src/lib/16_map.c @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -20,7 +20,12 @@ * */ +//TODO USE CA AND THIS FILE FORMAT + #include "src/lib/16_map.h" +//#define JSMN_STATIC +#include "src/lib/jsmn/jsmn.h" +#include // Ideally, preprocess json during compilation and read serialized data @@ -32,85 +37,141 @@ int jsoneq(const char *json, jsmntok_t *tok, const char *s) { return -1; } +//TODO: WORK ON THIS LIKE CRAZY! --sparky4 +//FIXME: please FIX THIS AND USE CA! --sparky4 void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) { int i, j, k, indent=0, inner_end; - bitmap_t bp; - //char *s; + char *s; + boolean objlay=0; + //bitmap_t bp; + i = 0; +#define MAPLNAMESIZE t[i+1].end - t[i+1].start while(idata = malloc(sizeof(byte*) * t[i].size); inner_end = t[i].end; k = 0; while(t[i].start < inner_end) { - printf("%d, %d\n", t[i].start, inner_end); +//#define DEBUG_DUMPVARS +//#ifdef DEBUG_DUMPVARS +// printf("t[%d].start=%d, %d\n", i, t[i].start, inner_end); +//#endif + if(!objlay){ if(jsoneq(js, &(t[i]), "data") == 0) { - #ifdef DEBUG_MAPVAR - printf("Layer %d data: [", k); - #endif - map->data[k] = malloc(sizeof(byte) * t[i+1].size); +#ifdef DEBUG_MAPDATA + printf("Layer %d data: (size is %d)[\n", k, t[i+1].size); +#endif + map->layerdata[k].data = malloc(sizeof(byte) * t[i+1].size);//TODO: USE MM_ CA_ AND PM_ for(j = 0; j < t[i+1].size; j++) { - map->data[k][j] = (byte)atoi(js + t[i+2+j].start); - #ifdef DEBUG_MAPVAR - printf("%d, ", map->data[k][j]); - #endif + map->layerdata[k].data[j] = (byte)atoi(js + t[i+2+j].start); +#ifdef DEBUG_MAPDATA + printf("%c", map->layerdata[k].data[j]+44); +#endif } i += j + 2; +#ifdef DEBUG_MAPDATA + puts("\n]"); +#endif + }else if(jsoneq(js, &(t[i]), "name") == 0) { +#ifdef DEBUG_MAPVARS + printf("Layer %d's name: (size is %d)[\n", k, MAPLNAMESIZE); +#endif + //map->layerdata[k].layername = malloc(sizeof(byte) * MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_ + strncpy(&(map->layerdata[k].layername), js+t[i+1].start, MAPLNAMESIZE); + if((map->layerdata[k].layername[MAPLNAMESIZE])!=0) map->layerdata[k].layername[MAPLNAMESIZE]='\0'; + if(strstr(&map->layerdata[k].layername, "ob")) objlay=1; +#ifdef DEBUG_MAPDATA + printf("%s", map->layerdata[k].layername); + printf("\n]\n"); +#endif k++; - #ifdef DEBUG_MAPVAR - puts("]"); - #endif } - else{ - i++; - } - } - } + }else{ //objlay + if(jsoneq(js, &(t[i]), "objects") == 0) { +#ifdef DEBUG_OBVARS + printf("objects detected\n"); +#endif +#ifdef DEBUG_OBVARS + +#endif +// map->layerdata[k].layername = mAlloc(sizeof(byte) * MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_ +// strncpy(map->layerdata[k].layername, js+t[i+1].start, MAPLNAMESIZE);//TODO: USE MM_ CA_ AND PM_ +// if(map->layerdata[k].layername[MAPLNAMESIZE]!=0) map->layerdata[k].layername[MAPLNAMESIZE]='\0'; + }else if(jsoneq(js, &(t[i]), "name") == 0) { +#ifdef DEBUG_OBVARS + printf("Object %d's name: ", k);//, MAPLNAMESIZE + printf("'%.*s'\n", t[i+1].end - t[i+1].start, js+t[i+1].start); +#endif + }else if(jsoneq(js, &(t[i]), "properties") == 0) { +#ifdef DEBUG_OBVARS + printf(" properties: %.*s\n", t[i+1].end - t[i+1].start, js+t[i+1].start); +#endif + }else if(jsoneq(js, &(t[i]), "walkable") == 0) { + printf(" walkable: %d\n", atoi(js + t[i+1].start)); + } + + }//end objlay + i++;//next token + }//tokens + }//layers + + if(jsoneq(js, &(t[i]), "tilesets") == 0) { i++; - map->tiles = malloc(sizeof(tiles_t*) * t[i].size); inner_end = t[i].end; k = 0; while(t[i].start < inner_end) { if(jsoneq(js, &(t[i]), "image") == 0) { - //fix this to be far~ - map->tiles[k] = malloc(sizeof(tiles_t)); - map->tiles[k]->btdata = malloc(sizeof(bitmap_t)); - map->tiles[k]->tileHeight = 16; - map->tiles[k]->tileWidth = 16; - map->tiles[k]->rows = 1; - map->tiles[k]->cols = 1; - map->tiles[k]->debug_text=false; - //Fix to load tileset specified. + map->tiles = malloc(sizeof(tiles_t));//TODO: USE MM_ CA_ AND PM_ + s = remove_ext((char *)js+t[i+1].start, '.', '/'); + strcpy(map->tiles->imgname, s); //And move to vrs, probably - //bp = bitmapLoadPcx("data/ed.pcx"); - map->tiles[k]->btdata = &bp; - k++; +// bp = bitmapLoadPcx("data/ed.pcx"); +// map->tiles->btdata = &bp; + map->tiles->rows = 1; + map->tiles->cols = 1; +#ifdef __DEBUG_MAP__ + dbg_maptext=false; +#endif + i++; + }else if(jsoneq(js, &(t[i]), "tileheight") == 0) { + map->tiles->tileHeight = atoi(js + t[i+1].start); +#ifdef DEBUG_MAPVARS + printf("Tile Height: %d\n", map->tiles->tileHeight); +#endif + i++; + }else if(jsoneq(js, &(t[i]), "tilewidth") == 0) { + map->tiles->tileWidth = atoi(js + t[i+1].start); +#ifdef DEBUG_MAPVARS + printf("Tile Width: %d\n", map->tiles->tileWidth); +#endif + i++; } i++; + k++; } } if (jsoneq(js, &(t[i]), "height") == 0 && indent<=1) { map->height = atoi(js + t[i+1].start); - #ifdef DEBUG_MAPVAR +#ifdef DEBUG_MAPVARS printf("Height: %d\n", map->height); - #endif +#endif i++; } else if(jsoneq(js, &(t[i]), "width") == 0 && indent<=1) { map->width = atoi(js + t[i+1].start); - #ifdef DEBUG_MAPVAR +#ifdef DEBUG_MAPVARS printf("Width: %d\n", map->width); - #endif +#endif i++; } i++; } } -int loadmap(char *mn, map_t *map) { +int newloadmap(char *mn, map_t *map) { char *js; jsmn_parser p; @@ -124,7 +185,7 @@ int loadmap(char *mn, map_t *map) { jsmn_init(&p); file_s = filesize(fh); - js = malloc(file_s); + js = malloc(file_s);//TODO: USE MM_ CA_ AND PM_ if(js == NULL) { fprintf(stderr, "malloc(): errno = %d", 2); fclose(fh); @@ -137,7 +198,7 @@ int loadmap(char *mn, map_t *map) { return 1; } tokcount = jsmn_parse(&p, js, file_s, NULL, 0); - tok = malloc(tokcount*sizeof(jsmntok_t)); + tok = malloc(tokcount*sizeof(jsmntok_t));//TODO: USE MM_ CA_ AND PM_ printf("Allocated %d tokens", tokcount); jsmn_init(&p); if((status = jsmn_parse(&p, js, file_s, tok, tokcount)) < 0) @@ -148,9 +209,47 @@ int loadmap(char *mn, map_t *map) { else if(status != tokcount) { printf("Warning: used %d tok\n", status);} extract_map(js, tok, tokcount, map); - free(js); - free(tok); - fclose(fh); + free(js); //TODO: USE MM_ CA_ AND PM_ + free(tok); //TODO: USE MM_ CA_ AND PM_ + fclose(fh); //TODO: USE MM_ CA_ AND PM_ + + return 0; +} + + +//====== + + +int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar) +{ + jsmn_parser p; + jsmntok_t *tok = NULL; + size_t tokcount, file_s; + + FILE *fh = fopen(mn, "r"); + int status; + + /* Prepare parser */ + jsmn_init(&p); + + file_s = filesize(fh); + CA_LoadFile(mn, MEMPTRCONV MAPSEGINLM, gvar); + tokcount = jsmn_parse(&p, (char const *)MAPSEGINLM, file_s, NULL, 0); + tok = malloc(tokcount*sizeof(jsmntok_t));//TODO: USE MM_ CA_ AND PM_ +// printf("Allocated %d tokens", tokcount); + jsmn_init(&p); + if((status = jsmn_parse(&p, (char const *)MAPSEGINLM, file_s, tok, tokcount)) < 0) + { + printf("Error: %d\n", status); + return status; + } + else if(status != tokcount) { printf("Warning: used %d tok\n", status);} + extract_map((char const *)MAPSEGINLM, tok, tokcount, map); + +// printf("freeing tok\n"); + free(tok); //TODO: USE MM_ CA_ AND PM_ +// printf("fclose fh\n"); + fclose(fh); //TODO: USE MM_ CA_ AND PM_ return 0; }