X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.c;h=33c27d1446fb98d81c362e15519466160c1bd331;hb=def418b6ee7f06ce7229e6eae5dbfbe44e9b9e82;hp=6bd66ccf5ddfb716474223787190f2e02226fe8a;hpb=ea82069949d35f517679d02184787b70a74c2fc2;p=16.git

diff --git a/src/lib/16_map.c b/src/lib/16_map.c
index 6bd66ccf..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-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ * Copyright (C) 2012-2019 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
  *
  * This file is part of Project 16.
  *
@@ -23,6 +23,8 @@
 //TODO USE CA AND THIS FILE FORMAT
 
 #include "src/lib/16_map.h"
+//#define JSMN_STATIC
+#include "src/lib/jsmn/jsmn.h"
 #include <malloc.h>
 
 // Ideally, preprocess json during compilation and read serialized data
@@ -35,6 +37,8 @@ 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;
 	char *s;
@@ -242,10 +246,10 @@ int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar)
 	else if(status != tokcount) { printf("Warning: used %d tok\n", status);}
 	extract_map((char const *)MAPSEGINLM, tok, tokcount, map);
 
-	printf("freeing tok\n");
+//	printf("freeing tok\n");
 	free(tok);	//TODO: USE MM_ CA_ AND PM_
 //	printf("fclose fh\n");
-//	fclose(fh);	//TODO: USE MM_ CA_ AND PM_
+	fclose(fh);	//TODO: USE MM_ CA_ AND PM_
 
 	return 0;
 }