X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.c;h=33c27d1446fb98d81c362e15519466160c1bd331;hb=d6bf85570f22605fec8f47fc66f19eb5ac9a7c03;hp=45c85760a6a95868cda4a652e72302dfb49a56b2;hpb=22e2009b7f5d8605fd39b011ea6bba405c7ecc0f;p=16.git
diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index 45c85760..33c27d14 100755
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -1,147 +1,255 @@
-/* Project 16 Source Code~
- * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
- *
- * This file is part of Project 16.
- *
- * Project 16 is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
- *
- * Project 16 is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program. If not, see , or
- * write to the Free Software Foundation, Inc., 51 Franklin Street,
- * Fifth Floor, Boston, MA 02110-1301 USA.
- *
- */
-
-#include "16_map.h"
-
-// Ideally, preprocess json during compilation and read serialized data
-
-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) {
- return 0;
- }
- return -1;
-}
-
-void extract_map(const char *js, jsmntok_t *t, size_t count, map_t *map) {
- int i, j, k, indent, inner_end;
- bitmap_t bp;
- #ifdef DEBUG_DUMPVARS
- fprintf(stderr, "t->size=[%d] ", t->size);
- fprintf(stderr, "q=[%d] ", q);
- fprintf(stderr, "indent= [%d] ", indent);
- fprintf(stderr, "js_sv= [%s]\n", js_sv);
- #endif
- map->tiles = malloc(sizeof(tiles_t));
- map->tiles->btdata = malloc(sizeof(bitmap_t));
- //fix this to be far~
- //And a pointer
- bp = bitmapLoadPcx("data/ed.pcx");
- map->tiles->btdata = &bp;
- map->tiles->tileHeight = 16;
- map->tiles->tileWidth = 16;
- map->tiles->rows = 1;
- map->tiles->cols = 1;
- map->tiles->debug_text=false;
-
- while(idata = malloc(sizeof(*byte) * t[i].size);
- inner_end = t[i].end;
- k = 0;
- while(t[i].start < inner_end) {
- if(jsoneq(js, t, "data") == 0) {
- map->data[k] = malloc(sizeof(byte) * t[i+1].size);
- for(j = 0; j < t[i+1].size; j++) {
- map->data[k][j] = (byte)atoi(js + t[i+1+j].start);
- }
- i += j + 1;
- k++;
- }
- }
- }/*
- if(jsoneq(js, t, "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, "data") == 0) {
- map->tiles[k] = malloc(sizeof(tiles_t));
- bp = bitmapLoadPcx("data/ed.pcx");
- map->tiles[k].btdata = &bp;
- k++;
- }
- }
- }*/
-
- if (jsoneq(js, t, "height") == 0 && indent<=1) {
- map->height = atoi(js + t[i+1].start);
- #ifdef DEBUG_MAPVAR
- fprintf(stderr, "indent= [%d] ", indent);
- fprintf(stderr, "h:[%d]\n", map->height);
- #endif
- i++;
- }
- else if(jsoneq(js, t, "width") == 0 && indent<=1) {
- map->width = atoi(js+t[i+1]->start);
- #ifdef DEBUG_MAPVAR
- fprintf(stderr, "indent= [%d] ", indent);
- fprintf(stderr, "w:[%d]\n", map->width);
- #endif
- i++;
- }
- i++;
- }
-}
-
-int loadmap(char *mn, map_t *map) {
- char *js;
- char js_ss[16];
-
- jsmn_parser p;
- jsmntok_t *tok = NULL;
- size_t tokcount, file_s;
-
- FILE *fh = fopen(mn, "r");
-
- /* Prepare parser */
- jsmn_init(&p);
-
- file_s = filesize(fh);
- js = malloc(file_s);
- if(js == NULL) {
- fprintf(stderr, "malloc(): errno = %d", 2);
- fclose(fh);
- return 3;
- }
- if(fread(js, 1, file_s, fh) != file_s) {
- fprintf(stderr, "Map read error");
- free(js);
- fclose(fh);
- return 1;
- }
-
- tokcount = jsmn_parse(&p, js, file_s, NULL, 0);
- tok = malloc(tokcount*sizeof(jsmntok_t));
- jsmn_parse(&p, js, file_s, tok, tokcount);
- fprintf(stderr, "running dump~\n");
- printf("%d\n", p.toknext);
- extract_map(js, tok, tokcount, 0);
-
- free(js);
- free(tok);
- fclose(fh);
-
- return 0;
-}
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see , or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+//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
+
+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) {
+ return 0;
+ }
+ 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;
+ char *s;
+ boolean objlay=0;
+ //bitmap_t bp;
+
+ i = 0;
+#define MAPLNAMESIZE t[i+1].end - t[i+1].start
+ while(ilayerdata[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->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++;
+ }
+ }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++;
+ inner_end = t[i].end;
+ k = 0;
+ while(t[i].start < inner_end) {
+ if(jsoneq(js, &(t[i]), "image") == 0) {
+ 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->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_MAPVARS
+ printf("Height: %d\n", map->height);
+#endif
+ i++;
+ }
+ else if(jsoneq(js, &(t[i]), "width") == 0 && indent<=1) {
+ map->width = atoi(js + t[i+1].start);
+#ifdef DEBUG_MAPVARS
+ printf("Width: %d\n", map->width);
+#endif
+ i++;
+ }
+ i++;
+ }
+}
+
+int newloadmap(char *mn, map_t *map) {
+ char *js;
+
+ 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);
+ js = malloc(file_s);//TODO: USE MM_ CA_ AND PM_
+ if(js == NULL) {
+ fprintf(stderr, "malloc(): errno = %d", 2);
+ fclose(fh);
+ return 3;
+ }
+ if(fread(js, 1, file_s, fh) != file_s) {
+ fprintf(stderr, "Map read error");
+ free(js);
+ fclose(fh);
+ return 1;
+ }
+ tokcount = jsmn_parse(&p, js, 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, js, 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(js, tok, tokcount, map);
+
+ 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;
+}