JSMN_STATIC is commented out for more memory

[16.git] / src / lib / 16_map.c

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index bcda288f794fd9e5943179d6f008653d99398629..33c27d1446fb98d81c362e15519466160c1bd331 100755 (executable)
--- a/src/lib/16_map.c
+++ b/src/lib/16_map.c
@@ -1,5 +1,5 @@
 /* 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
@@ -20,7 +20,11 @@
  *\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
@@ -33,6 +37,8 @@ int jsoneq(const char *json, jsmntok_t *tok, const char *s) {
        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=0, inner_end;\r
        char *s;\r
@@ -214,7 +220,6 @@ int newloadmap(char *mn, map_t *map) {
 //======\r
 \r
 \r
-#define MAPBUFINLM *(gvar->ca.mapsegs)\r
 int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)\r
 {\r
        jsmn_parser p;\r
@@ -228,20 +233,22 @@ int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
        jsmn_init(&p);\r
 \r
        file_s = filesize(fh);\r
-       CA_LoadFile(mn, (memptr *)&MAPBUFINLM, gvar);\r
-       tokcount = jsmn_parse(&p, (char const *)MAPBUFINLM, file_s, NULL, 0);\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 *)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((char const *)MAPBUFINLM, tok, tokcount, map);\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