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 ad846e81b10bae5149e44ea7effc21606343781a..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
@@ -23,6 +23,8 @@
 //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
@@ -35,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
@@ -242,7 +246,9 @@ int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
        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