X-Git-Url: http://4ch.mooo.com/gitweb/?a=blobdiff_plain;ds=inline;f=src%2Flib%2F16_map.h;h=8ea0ec19856647053641223294302dc68aa90bed;hb=29204d5f82b02c730907d7cdf6760f291ae8e93e;hp=5cf56c2c0ade0ce15ca97f755570c7d2573c563b;hpb=b79af85b8e5b6ff94341b85ea2de8a5dfb9080f5;p=16.git diff --git a/src/lib/16_map.h b/src/lib/16_map.h index 5cf56c2c..8ea0ec19 100755 --- a/src/lib/16_map.h +++ b/src/lib/16_map.h @@ -1,5 +1,5 @@ /* Project 16 Source Code~ - * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover + * Copyright (C) 2012-2017 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover * * This file is part of Project 16. * @@ -34,15 +34,16 @@ #include "src/lib/16_pm.h" //#define DEBUG_MAPDATA -//#define DEBUG_MAPVAR -//#define DEBUG_DUMPVARS +//#define DEBUG_MAPVARS +#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); -int newloadmap(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_*/