X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;f=src%2Flib%2F16_map.h;h=0481c83eaa930d123b388bcde08ba7ba0b4e6ba5;hb=a565be31ce92d6168ae6983042da75b0b683e52b;hp=4c6b9a8c6cdb681d1dc0e10d216ac6bdeb96b679;hpb=e5bca67ebc01790a89af93e777ca19cd309ec4e5;p=16.git diff --git a/src/lib/16_map.h b/src/lib/16_map.h index 4c6b9a8c..0481c83e 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. * @@ -31,13 +31,12 @@ #include "src/lib/16_vl.h" #include "src/lib/16_ca.h" #include "src/lib/16_mm.h" -#ifdef __WATCOMC__ #include "src/lib/16_pm.h" -#endif + //#define DEBUG_MAPDATA //#define DEBUG_MAPVARS -#define DEBUG_OBVARS +//0000++#define DEBUG_OBVARS //#define DEBUG_JS //typedefs moved to 16_tdef.h @@ -45,7 +44,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_*/