X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=32a7da98c99f2311c7f97e85a14326790bab6cce;hb=9faff683f275abe93daa14b968af0126a21c50e5;hp=84cfd923e021aa4a4b22b64a04825e1a36b48bb2;hpb=17ec26395419ff775f29661e50265dfbccfda3b0;p=16.git diff --git a/src/lib/16_map.h b/src/lib/16_map.h index 84cfd923..32a7da98 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-2023 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -25,7 +25,6 @@ #include "src/lib/16_head.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" @@ -33,16 +32,17 @@ #include "src/lib/16_mm.h" #include "src/lib/16_pm.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); +//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 newloadmap(char *mn, map_t *map); +int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar); #endif/*_16_LIB__H_*/