X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=b2e5dd5283abc45370b9ea7824482b11329ff87c;hb=e7476357695d692374e26dd4cba93b2e1fdabe84;hp=e8290486aa45f6832bdf4132b23420a666f73045;hpb=2e25faae6f6199f00a6e35b2ba092cd6c87d2770;p=16.git diff --git a/src/lib/16_map.h b/src/lib/16_map.h index e8290486..b2e5dd52 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. * @@ -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,17 +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, 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_*/