1 files changed, 22 insertions, 17 deletions
diff --git a/src/map/intif.hpp b/src/map/intif.hpp
index 80de797..5be61a9 100644
--- a/src/map/intif.hpp
+++ b/src/map/intif.hpp
@@ -1,5 +1,4 @@
-#ifndef TMWA_MAP_INTIF_HPP
-#define TMWA_MAP_INTIF_HPP
+#pragma once
 //    intif.hpp - Network interface to the internal server.
 //
 //    Copyright © ????-2004 Athena Dev Teams
@@ -21,33 +20,39 @@
 //    You should have received a copy of the GNU General Public License
 //    along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# include "../sanity.hpp"
+#include "fwd.hpp"
 
-# include "../strings/fwd.hpp"
+#include "../strings/fwd.hpp"
 
-# include "map.hpp"
+#include "../generic/fwd.hpp"
 
-int intif_parse(Session *);
+#include "../net/fwd.hpp"
+
+#include "../mmo/fwd.hpp"
+
+
+namespace tmwa
+{
+RecvResult intif_parse(Session *, uint16_t packet_id);
 
 void intif_GMmessage(XString mes);
 
 void intif_wis_message(dumb_ptr<map_session_data> sd, CharName nick, ZString mes);
-void intif_wis_message_to_gm(CharName Wisp_name, int min_gm_level, ZString mes);
+void intif_wis_message_to_gm(CharName Wisp_name, GmLevel min_gm_level, ZString mes);
 
 void intif_saveaccountreg(dumb_ptr<map_session_data> sd);
 void intif_request_accountreg(dumb_ptr<map_session_data> sd);
 
-void intif_request_storage(int account_id);
-void intif_send_storage(struct storage *stor);
+void intif_request_storage(AccountId account_id);
+void intif_send_storage(Storage *stor);
 
 void intif_create_party(dumb_ptr<map_session_data> sd, PartyName name);
-void intif_request_partyinfo(int party_id);
-void intif_party_addmember(int party_id, int account_id);
-void intif_party_changeoption(int party_id, int account_id, int exp,
+void intif_request_partyinfo(PartyId party_id);
+void intif_party_addmember(PartyId party_id, AccountId account_id);
+void intif_party_changeoption(PartyId party_id, AccountId account_id, int exp,
         int item);
-void intif_party_leave(int party_id, int accound_id);
+void intif_party_leave(PartyId party_id, AccountId accound_id);
 void intif_party_changemap(dumb_ptr<map_session_data> sd, int online);
-void intif_party_message(int party_id, int account_id, XString mes);
-void intif_party_checkconflict(int party_id, int account_id, CharName nick);
-
-#endif // TMWA_MAP_INTIF_HPP
+void intif_party_message(PartyId party_id, AccountId account_id, XString mes);
+void intif_party_checkconflict(PartyId party_id, AccountId account_id, CharName nick);
+} // namespace tmwa