From b3112bd3f6d0887fdf81610327c9edad08a0cfaf Mon Sep 17 00:00:00 2001 From: Ben Longbons Date: Sat, 10 Jan 2015 17:32:49 -0800 Subject: Use generated config for map --- src/map/party.cpp | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'src/map/party.cpp') diff --git a/src/map/party.cpp b/src/map/party.cpp index b05f4f1..ccbfd75 100644 --- a/src/map/party.cpp +++ b/src/map/party.cpp @@ -35,7 +35,9 @@ #include "../high/mmo.hpp" #include "battle.hpp" +#include "battle_conf.hpp" #include "clif.hpp" +#include "globals.hpp" #include "intif.hpp" #include "map.hpp" #include "pc.hpp" @@ -45,12 +47,11 @@ namespace tmwa { +namespace map +{ // 座標やHP送信の間隔 constexpr interval_t PARTY_SEND_XYHP_INVERVAL = 1_s; -static -Map party_db; - static void party_check_conflict(dumb_ptr sd); static @@ -782,4 +783,5 @@ void party_foreachsamemap(std::function)> func, if (list[i]->bl_prev) // 有効かどうかチェック func(list[i]); } +} // namespace map } // namespace tmwa -- cgit v1.2.3-70-g09d2