cleaned up 16_map.h

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

diff --git a/src/lib/16_map.h b/src/lib/16_map.h
index 5cf56c2c0ade0ce15ca97f755570c7d2573c563b..b2e5dd5283abc45370b9ea7824482b11329ff87c 100755 (executable)
--- a/src/lib/16_map.h
+++ b/src/lib/16_map.h
@@ -1,5 +1,5 @@
 /* Project 16 Source Code~\r
- * Copyright (C) 2012-2016 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
@@ -25,7 +25,6 @@
 \r
 #include "src/lib/16_head.h"\r
 #include "src/lib/16_tdef.h"\r
-#include "src/lib/jsmn/jsmn.h"\r
 //#include "stdio.h" included in 16_head.h\r
 //#include "stdlib.h" included in 16_head.h\r
 #include "src/lib/16_vl.h"\r
@@ -33,16 +32,17 @@
 #include "src/lib/16_mm.h"\r
 #include "src/lib/16_pm.h"\r
 \r
+\r
 //#define DEBUG_MAPDATA\r
-//#define DEBUG_MAPVAR\r
-//#define DEBUG_DUMPVARS\r
+//#define DEBUG_MAPVARS\r
+//0000++#define DEBUG_OBVARS\r
 //#define DEBUG_JS\r
 \r
 //typedefs moved to 16_tdef.h\r
 \r
-int jsoneq(const char *json, jsmntok_t *tok, const char *s);\r
-word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);\r
-int loadmap(char *mn, map_t *map);\r
+//word dump(const char *js, jsmntok_t *t, size_t count, word indent, char *js_sv, map_t *map, dword q);\r
+//int loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
 int newloadmap(char *mn, map_t *map);\r
+int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar);\r
 \r
 #endif/*_16_LIB__H_*/\r