diff options
| author | Er_Maqui <er_maqui@darkbolt.net> | 2015-10-21 14:54:40 +0200 |
|---|---|---|
| committer | Er_Maqui <er_maqui@darkbolt.net> | 2015-10-21 14:54:40 +0200 |
| commit | 198aef7133713b47a4c4fadaac6811c9d3812d19 (patch) | |
| tree | 84df335dd0ad350c20f8c2a018b2a7096907b636 /src/map/map.c | |
| parent | 6977d6d31b58afc5095c0a59e754f21ea1080054 (diff) | |
| parent | 8b198db1e0ccc8209b7bcf54b4df62d4747f75b2 (diff) | |
| download | hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.gz hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.bz2 hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.tar.xz hercules-198aef7133713b47a4c4fadaac6811c9d3812d19.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'src/map/map.c')
| -rw-r--r-- | src/map/map.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/map/map.c b/src/map/map.c index b142ed1f3..9a7cbe163 100644 --- a/src/map/map.c +++ b/src/map/map.c @@ -48,7 +48,7 @@ #include "common/core.h" #include "common/ers.h" #include "common/grfio.h" -#include "common/malloc.h" +#include "common/memmgr.h" #include "common/nullpo.h" #include "common/random.h" #include "common/showmsg.h" @@ -5874,7 +5874,7 @@ int do_init(int argc, char *argv[]) map->nick_db = idb_alloc(DB_OPT_BASE); map->charid_db = idb_alloc(DB_OPT_BASE); map->regen_db = idb_alloc(DB_OPT_BASE); // efficient status_natural_heal processing - map->iwall_db = strdb_alloc(DB_OPT_RELEASE_DATA,2*NAME_LENGTH+2+1); // [Zephyrus] Invisible Walls + map->iwall_db = strdb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA, 2*NAME_LENGTH+2+1); // [Zephyrus] Invisible Walls map->zone_db = strdb_alloc(DB_OPT_DUP_KEY|DB_OPT_RELEASE_DATA, MAP_ZONE_NAME_LENGTH); map->iterator_ers = ers_new(sizeof(struct s_mapiterator),"map.c::map_iterator_ers",ERS_OPT_CLEAN|ERS_OPT_FLEX_CHUNK); |