X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=f99193b52097e70b7f8b0b697fd0de8377863ef9;hb=eefd43fada99517f9ad662510392e898412ec867;hp=8ea0ec19856647053641223294302dc68aa90bed;hpb=cccf74b8d5b618b293330755da222138dcf619cc;p=16.git diff --git a/src/lib/16_map.h b/src/lib/16_map.h index 8ea0ec19..f99193b5 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. * @@ -23,6 +23,8 @@ #ifndef _16_MAP__H_ #define _16_MAP__H_ +#define JSMN_STATIC + #include "src/lib/16_head.h" #include "src/lib/16_tdef.h" #include "src/lib/jsmn/jsmn.h" @@ -33,9 +35,10 @@ #include "src/lib/16_mm.h" #include "src/lib/16_pm.h" + //#define DEBUG_MAPDATA //#define DEBUG_MAPVARS -#define DEBUG_OBVARS +//0000++#define DEBUG_OBVARS //#define DEBUG_JS //typedefs moved to 16_tdef.h @@ -43,7 +46,7 @@ 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 newloadmap(char *mn, map_t *map); +int newloadmap(char *mn, map_t *map); int CA_loadmap(char *mn, map_t *map, global_game_variables_t *gvar); #endif/*_16_LIB__H_*/