X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=d40701db85772b40f8bf1a4c26192112b2ba6f56;hb=00dbe7960ddbd83c208fe1e02cfcd2910fa0cb84;hp=26901678ae24b5a8f604b3b1a0605678a433451c;hpb=5d57fb1ad5b8342b68eda18973c2f45d81481a2e;p=16.git

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 26901678..d40701db 100755
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -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.
  *
@@ -24,25 +24,28 @@
 #define _16_MAP__H_
 
 #include "src/lib/16_head.h"
+#include "src/lib/16_tail.h"
 #include "src/lib/16_tdef.h"
-#include "src/lib/jsmn/jsmn.h"
 //#include "stdio.h" included in 16_head.h
 //#include "stdlib.h" included in 16_head.h
 #include "src/lib/16_vl.h"
 #include "src/lib/16_ca.h"
 #include "src/lib/16_mm.h"
 #include "src/lib/16_pm.h"
+/*#define JSMN_STATIC
+#include "src/lib/jsmn/jsmn.h"
+*/
+
 
 //#define DEBUG_MAPDATA
-//#define DEBUG_MAPVAR
-//#define DEBUG_DUMPVARS
+//#define DEBUG_MAPVARS
+//0000++#define DEBUG_OBVARS
 //#define DEBUG_JS
 
 //typedefs moved to 16_tdef.h
 
-int jsoneq(const char *json, jsmntok_t *tok, const char *s);
 //word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);
-int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);
+//int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);
 int newloadmap(char *mn, map_t *map);
 int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar);