From e1418f378c66343a35db3791cbf0d54a4be3fbd3 Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 15 Nov 2014 12:29:33 -0800 Subject: Generate most config parsers --- src/map/map.cpp | 4 ---- src/map/map.hpp | 5 ++++- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'src/map') diff --git a/src/map/map.cpp b/src/map/map.cpp index e5705aa..527d3c3 100644 --- a/src/map/map.cpp +++ b/src/map/map.cpp @@ -116,9 +116,6 @@ const CharName WISP_SERVER_NAME = stringish("Server"_s); map_local undefined_gat = [](){ map_local rv {}; rv.name_ = stringish("undefined.gat"_s); return rv; }(); -static -void map_delmap(MapName mapname); - void SessionDeleter::operator()(SessionData *sd) { really_delete1 static_cast(sd); @@ -1367,7 +1364,6 @@ bool map_readallmap(void) * 読み込むmapを追加する *------------------------------------------ */ -static void map_addmap(MapName mapname) { if (mapname == "clear"_s) diff --git a/src/map/map.hpp b/src/map/map.hpp index ac16fe9..48bd997 100644 --- a/src/map/map.hpp +++ b/src/map/map.hpp @@ -64,7 +64,7 @@ constexpr int MAX_LEVEL = 255; constexpr int MAX_WALKPATH = 48; constexpr int MAX_DROP_PER_MAP = 48; -constexpr interval_t DEFAULT_AUTOSAVE_INTERVAL = 1_min; +constexpr std::chrono::seconds DEFAULT_AUTOSAVE_INTERVAL = 1_min; extern map_local undefined_gat; @@ -698,4 +698,7 @@ inline dumb_ptr npc_data::is_script() { return npc_subtype == N inline dumb_ptr npc_data::is_shop() { return npc_subtype == NpcSubtype::SHOP ? as_shop() : nullptr ; } inline dumb_ptr npc_data::is_warp() { return npc_subtype == NpcSubtype::WARP ? as_warp() : nullptr ; } inline dumb_ptr npc_data::is_message() { return npc_subtype == NpcSubtype::MESSAGE ? as_message() : nullptr ; } + +void map_addmap(MapName mapname); +void map_delmap(MapName mapname); } // namespace tmwa -- cgit v1.2.3-70-g09d2