diff options
Diffstat (limited to 'src/char')
-rw-r--r-- | src/char/char.cpp | 4 | ||||
-rw-r--r-- | src/char/char.hpp | 4 | ||||
-rw-r--r-- | src/char/fwd.hpp | 4 | ||||
-rw-r--r-- | src/char/int_party.cpp | 4 | ||||
-rw-r--r-- | src/char/int_party.hpp | 4 | ||||
-rw-r--r-- | src/char/int_storage.cpp | 4 | ||||
-rw-r--r-- | src/char/int_storage.hpp | 4 | ||||
-rw-r--r-- | src/char/inter.cpp | 4 | ||||
-rw-r--r-- | src/char/inter.hpp | 4 | ||||
-rw-r--r-- | src/char/main.cpp | 5 |
10 files changed, 41 insertions, 0 deletions
diff --git a/src/char/char.cpp b/src/char/char.cpp index 3b0d43e..392943a 100644 --- a/src/char/char.cpp +++ b/src/char/char.cpp @@ -78,6 +78,9 @@ #include "../poison.hpp" + +namespace tmwa +{ static Array<struct mmo_map_server, MAX_MAP_SERVERS> server; static @@ -3156,3 +3159,4 @@ int do_init(Slice<ZString> argv) return 0; } +} // namespace tmwa diff --git a/src/char/char.hpp b/src/char/char.hpp index f8adeb9..ffd6f06 100644 --- a/src/char/char.hpp +++ b/src/char/char.hpp @@ -31,6 +31,9 @@ # include "../mmo/mmo.hpp" + +namespace tmwa +{ constexpr int MAX_MAP_SERVERS = 30; struct mmo_map_server @@ -51,5 +54,6 @@ void char_log(XString line); # define CHAR_LOG(fmt, ...) \ char_log(STRPRINTF(fmt, ## __VA_ARGS__)) +} // namespace tmwa #endif // TMWA_CHAR_CHAR_HPP diff --git a/src/char/fwd.hpp b/src/char/fwd.hpp index 4721cc2..04097a6 100644 --- a/src/char/fwd.hpp +++ b/src/char/fwd.hpp @@ -21,6 +21,10 @@ # include "../sanity.hpp" + +namespace tmwa +{ // meh, add more when I feel like it +} // namespace tmwa #endif // TMWA_CHAR_FWD_HPP diff --git a/src/char/int_party.cpp b/src/char/int_party.cpp index b86b3a4..fc6136b 100644 --- a/src/char/int_party.cpp +++ b/src/char/int_party.cpp @@ -46,6 +46,9 @@ #include "../poison.hpp" + +namespace tmwa +{ AString party_txt = "save/party.txt"_s; static @@ -843,3 +846,4 @@ void inter_party_leave(PartyId party_id, AccountId account_id) { mapif_parse_PartyLeave(nullptr, party_id, account_id); } +} // namespace tmwa diff --git a/src/char/int_party.hpp b/src/char/int_party.hpp index 1d8cadc..88ce05f 100644 --- a/src/char/int_party.hpp +++ b/src/char/int_party.hpp @@ -29,6 +29,9 @@ # include "../mmo/fwd.hpp" + +namespace tmwa +{ void inter_party_init(void); int inter_party_save(void); @@ -37,5 +40,6 @@ RecvResult inter_party_parse_frommap(Session *ms, uint16_t); void inter_party_leave(PartyId party_id, AccountId account_id); extern AString party_txt; +} // namespace tmwa #endif // TMWA_CHAR_INT_PARTY_HPP diff --git a/src/char/int_storage.cpp b/src/char/int_storage.cpp index 784347b..01665ec 100644 --- a/src/char/int_storage.cpp +++ b/src/char/int_storage.cpp @@ -41,6 +41,9 @@ #include "../poison.hpp" + +namespace tmwa +{ // ファイル名のデフォルト // inter_config_read()で再設定される AString storage_txt = "save/storage.txt"_s; @@ -269,3 +272,4 @@ RecvResult inter_storage_parse_frommap(Session *ms, uint16_t packet_id) } return rv; } +} // namespace tmwa diff --git a/src/char/int_storage.hpp b/src/char/int_storage.hpp index 6bf3e1f..e93be14 100644 --- a/src/char/int_storage.hpp +++ b/src/char/int_storage.hpp @@ -29,6 +29,9 @@ # include "../mmo/fwd.hpp" + +namespace tmwa +{ void inter_storage_init(void); int inter_storage_save(void); void inter_storage_delete(AccountId account_id); @@ -37,5 +40,6 @@ Storage *account2storage(AccountId account_id); RecvResult inter_storage_parse_frommap(Session *ms, uint16_t); extern AString storage_txt; +} // namespace tmwa #endif // TMWA_CHAR_INT_STORAGE_HPP diff --git a/src/char/inter.cpp b/src/char/inter.cpp index 354cba7..1cf41ff 100644 --- a/src/char/inter.cpp +++ b/src/char/inter.cpp @@ -51,6 +51,9 @@ #include "../poison.hpp" + +namespace tmwa +{ static AString accreg_txt = "save/accreg.txt"_s; @@ -484,3 +487,4 @@ RecvResult inter_parse_frommap(Session *ms, uint16_t packet_id) return rv; } +} // namespace tmwa diff --git a/src/char/inter.hpp b/src/char/inter.hpp index 9269017..ecfaf08 100644 --- a/src/char/inter.hpp +++ b/src/char/inter.hpp @@ -27,11 +27,15 @@ # include "../net/fwd.hpp" + +namespace tmwa +{ bool inter_config(XString key, ZString value); void inter_init2(); void inter_save(void); RecvResult inter_parse_frommap(Session *ms, uint16_t packet_id); extern int party_share_level; +} // namespace tmwa #endif // TMWA_CHAR_INTER_HPP diff --git a/src/char/main.cpp b/src/char/main.cpp index c2fd038..6636196 100644 --- a/src/char/main.cpp +++ b/src/char/main.cpp @@ -20,3 +20,8 @@ #include "char.hpp" #include "../poison.hpp" + + +namespace tmwa +{ +} // namespace tmwa |