1 files changed, 11 insertions, 9 deletions
diff --git a/src/map/intif.cpp b/src/map/intif.cpp
index 314db24..a5709ef 100644
--- a/src/map/intif.cpp
+++ b/src/map/intif.cpp
@@ -29,16 +29,19 @@
 
 #include "../io/cxxstdio.hpp"
 
-#include "../net/packets.hpp"
 #include "../net/socket.hpp"
 
-#include "../mmo/mmo.hpp"
+#include "../high/mmo.hpp"
 
 #include "../proto2/char-map.hpp"
 
+#include "../wire/packets.hpp"
+
 #include "battle.hpp"
+#include "battle_conf.hpp"
 #include "chrif.hpp"
 #include "clif.hpp"
+#include "globals.hpp"
 #include "map.hpp"
 #include "party.hpp"
 #include "pc.hpp"
@@ -49,6 +52,8 @@
 
 namespace tmwa
 {
+namespace map
+{
 //-----------------------------------------------------------------
 // inter serverへの送信
 
@@ -156,9 +161,8 @@ void intif_request_storage(AccountId account_id)
 }
 
 // 倉庫データ送信
-void intif_send_storage(Storage *stor)
+void intif_send_storage(Borrowed<Storage> stor)
 {
-    nullpo_retv(stor);
     if (!char_session)
         return;
 
@@ -386,7 +390,6 @@ int intif_parse_AccountReg(Session *, const Packet_Head<0x3804>& head, const std
 static
 int intif_parse_LoadStorage(Session *, const Packet_Payload<0x3810>& payload)
 {
-    Storage *stor;
     dumb_ptr<map_session_data> sd;
 
     sd = map_id2sd(account_to_block(payload.account_id));
@@ -397,7 +400,7 @@ int intif_parse_LoadStorage(Session *, const Packet_Payload<0x3810>& payload)
                     payload.account_id);
         return 1;
     }
-    stor = account2storage(payload.account_id);
+    P<Storage> stor = account2storage(payload.account_id);
     if (stor->storage_status == 1)
     {                           // Already open.. lets ignore this update
         if (battle_config.error_log)
@@ -463,9 +466,7 @@ void intif_parse_PartyInfo(Session *, const Packet_Head<0x3821>& head, bool has_
 
     PartyId pi = head.party_id;
     PartyMost pm = option.party_most;
-    PartyPair pp;
-    pp.party_id = pi;
-    pp.party_most = &pm;
+    PartyPair pp{pi, borrow(pm)};
     party_recv_info(pp);
 }
 
@@ -697,4 +698,5 @@ RecvResult intif_parse(Session *s, uint16_t packet_id)
     }
     return rv;
 }
+} // namespace map
 } // namespace tmwa