diff options
Diffstat (limited to 'src/net/tmwa')
34 files changed, 34 insertions, 34 deletions
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp index 982cce39b..1be501c66 100644 --- a/src/net/tmwa/adminhandler.cpp +++ b/src/net/tmwa/adminhandler.cpp @@ -32,7 +32,7 @@ #include "debug.h" -extern Net::AdminHandler *adminHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/auctionhandler.cpp b/src/net/tmwa/auctionhandler.cpp index af297bc03..4f7932410 100644 --- a/src/net/tmwa/auctionhandler.cpp +++ b/src/net/tmwa/auctionhandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::AuctionHandler *auctionHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/bankhandler.cpp b/src/net/tmwa/bankhandler.cpp index 25fccc368..d1c78c35f 100644 --- a/src/net/tmwa/bankhandler.cpp +++ b/src/net/tmwa/bankhandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::BankHandler *bankHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/battlegroundhandler.cpp b/src/net/tmwa/battlegroundhandler.cpp index c64bf23d7..64d0b95bb 100644 --- a/src/net/tmwa/battlegroundhandler.cpp +++ b/src/net/tmwa/battlegroundhandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::BattleGroundHandler *battleGroundHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp index de2a42134..c0729b505 100644 --- a/src/net/tmwa/beinghandler.cpp +++ b/src/net/tmwa/beinghandler.cpp @@ -28,7 +28,7 @@ #include "debug.h" -extern Net::BeingHandler *beingHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/buyingstorehandler.cpp b/src/net/tmwa/buyingstorehandler.cpp index 29550170d..156d6c72c 100644 --- a/src/net/tmwa/buyingstorehandler.cpp +++ b/src/net/tmwa/buyingstorehandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::BuyingStoreHandler *buyingStoreHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp index 7f48fb89c..221191056 100644 --- a/src/net/tmwa/buysellhandler.cpp +++ b/src/net/tmwa/buysellhandler.cpp @@ -35,7 +35,7 @@ #include "debug.h" -extern Net::BuySellHandler *buySellHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/cashshophandler.cpp b/src/net/tmwa/cashshophandler.cpp index 8379de3ab..912dfb0b5 100644 --- a/src/net/tmwa/cashshophandler.cpp +++ b/src/net/tmwa/cashshophandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::CashShopHandler *cashShopHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp index faaf89bc6..39dc852d5 100644 --- a/src/net/tmwa/charserverhandler.cpp +++ b/src/net/tmwa/charserverhandler.cpp @@ -39,7 +39,7 @@ #include "debug.h" -extern Net::CharServerHandler *charServerHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/charserverrecv.cpp b/src/net/tmwa/charserverrecv.cpp index 571ce0b3b..95cf04f26 100644 --- a/src/net/tmwa/charserverrecv.cpp +++ b/src/net/tmwa/charserverrecv.cpp @@ -52,7 +52,7 @@ #include "debug.h" -extern Net::CharServerHandler *charServerHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp index 2bc869d92..4a1741a12 100644 --- a/src/net/tmwa/chathandler.cpp +++ b/src/net/tmwa/chathandler.cpp @@ -36,7 +36,7 @@ #include "debug.h" -extern Net::ChatHandler *chatHandler; + extern unsigned int tmwServerVersion; namespace TmwAthena diff --git a/src/net/tmwa/elementalhandler.cpp b/src/net/tmwa/elementalhandler.cpp index 19bcd3dfc..b19ba62c8 100644 --- a/src/net/tmwa/elementalhandler.cpp +++ b/src/net/tmwa/elementalhandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::ElementalHandler *elementalHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/familyhandler.cpp b/src/net/tmwa/familyhandler.cpp index 8a06a0d2d..15648cfc8 100644 --- a/src/net/tmwa/familyhandler.cpp +++ b/src/net/tmwa/familyhandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::FamilyHandler *familyHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/friendshandler.cpp b/src/net/tmwa/friendshandler.cpp index 206553dee..8b5f2d298 100644 --- a/src/net/tmwa/friendshandler.cpp +++ b/src/net/tmwa/friendshandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::FriendsHandler *friendsHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp index d01acd178..e3baec5fd 100644 --- a/src/net/tmwa/gamehandler.cpp +++ b/src/net/tmwa/gamehandler.cpp @@ -37,7 +37,7 @@ #include "debug.h" -extern Net::GameHandler *gameHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp index 25e4aa1ad..736f8d859 100644 --- a/src/net/tmwa/generalhandler.cpp +++ b/src/net/tmwa/generalhandler.cpp @@ -72,7 +72,7 @@ #include "debug.h" -extern Net::GeneralHandler *generalHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp index f2199f503..2c557f1a1 100644 --- a/src/net/tmwa/guildhandler.cpp +++ b/src/net/tmwa/guildhandler.cpp @@ -23,7 +23,7 @@ #include "debug.h" -extern Net::GuildHandler *guildHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/homunculushandler.cpp b/src/net/tmwa/homunculushandler.cpp index 22a5f45f4..2ba8ed91e 100644 --- a/src/net/tmwa/homunculushandler.cpp +++ b/src/net/tmwa/homunculushandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::HomunculusHandler *homunculusHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp index 2d555fb84..65d0019f6 100644 --- a/src/net/tmwa/inventoryhandler.cpp +++ b/src/net/tmwa/inventoryhandler.cpp @@ -33,7 +33,7 @@ #include "debug.h" -extern Net::InventoryHandler *inventoryHandler; + // missing EQUIP_RING1_SLOT const EquipSlot::Type EQUIP_CONVERT[] = diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp index 393935f1a..22ea04859 100644 --- a/src/net/tmwa/loginhandler.cpp +++ b/src/net/tmwa/loginhandler.cpp @@ -32,7 +32,7 @@ #include "debug.h" -extern Net::LoginHandler *loginHandler; + extern unsigned int tmwServerVersion; namespace TmwAthena diff --git a/src/net/tmwa/mailhandler.cpp b/src/net/tmwa/mailhandler.cpp index 5d46e8eda..84b60d63b 100644 --- a/src/net/tmwa/mailhandler.cpp +++ b/src/net/tmwa/mailhandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::MailHandler *mailHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/maphandler.cpp b/src/net/tmwa/maphandler.cpp index 4302ac52d..ba169c285 100644 --- a/src/net/tmwa/maphandler.cpp +++ b/src/net/tmwa/maphandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::MapHandler *mapHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/markethandler.cpp b/src/net/tmwa/markethandler.cpp index 9576499b1..c7733a578 100644 --- a/src/net/tmwa/markethandler.cpp +++ b/src/net/tmwa/markethandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::MarketHandler *marketHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/mercenaryhandler.cpp b/src/net/tmwa/mercenaryhandler.cpp index 3bdf30399..ce0344b17 100644 --- a/src/net/tmwa/mercenaryhandler.cpp +++ b/src/net/tmwa/mercenaryhandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::MercenaryHandler *mercenaryHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp index 0c0b13116..7eefe800f 100644 --- a/src/net/tmwa/npchandler.cpp +++ b/src/net/tmwa/npchandler.cpp @@ -39,7 +39,7 @@ #include "debug.h" -extern Net::NpcHandler *npcHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp index 54c808556..59b8f8db2 100644 --- a/src/net/tmwa/partyhandler.cpp +++ b/src/net/tmwa/partyhandler.cpp @@ -36,7 +36,7 @@ #include "debug.h" -extern Net::PartyHandler *partyHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp index e5db8c93c..c8eb797d1 100644 --- a/src/net/tmwa/pethandler.cpp +++ b/src/net/tmwa/pethandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::PetHandler *petHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp index 66bd1a037..5240396e9 100644 --- a/src/net/tmwa/playerhandler.cpp +++ b/src/net/tmwa/playerhandler.cpp @@ -44,7 +44,7 @@ #include "debug.h" -extern Net::PlayerHandler *playerHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/roulettehandler.cpp b/src/net/tmwa/roulettehandler.cpp index 800d0144a..c811b4adc 100644 --- a/src/net/tmwa/roulettehandler.cpp +++ b/src/net/tmwa/roulettehandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::RouletteHandler *rouletteHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/searchstorehandler.cpp b/src/net/tmwa/searchstorehandler.cpp index a124351a8..5a57a3634 100644 --- a/src/net/tmwa/searchstorehandler.cpp +++ b/src/net/tmwa/searchstorehandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::SearchStoreHandler *searchStoreHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/serverfeatures.cpp b/src/net/tmwa/serverfeatures.cpp index 0c7bca22e..1cdbc77e0 100644 --- a/src/net/tmwa/serverfeatures.cpp +++ b/src/net/tmwa/serverfeatures.cpp @@ -23,7 +23,7 @@ #include "debug.h" extern unsigned int tmwServerVersion; -extern Net::ServerFeatures *serverFeatures; + namespace TmwAthena { diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp index 067387163..4fe1022c3 100644 --- a/src/net/tmwa/skillhandler.cpp +++ b/src/net/tmwa/skillhandler.cpp @@ -27,7 +27,7 @@ #include "debug.h" -extern Net::SkillHandler *skillHandler; + namespace TmwAthena { diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp index 28ecb15df..242817872 100644 --- a/src/net/tmwa/tradehandler.cpp +++ b/src/net/tmwa/tradehandler.cpp @@ -33,7 +33,7 @@ #include "debug.h" -extern Net::TradeHandler *tradeHandler; + extern std::string tradePartnerName; diff --git a/src/net/tmwa/vendinghandler.cpp b/src/net/tmwa/vendinghandler.cpp index c898eff90..c6d760e4a 100644 --- a/src/net/tmwa/vendinghandler.cpp +++ b/src/net/tmwa/vendinghandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::VendingHandler *vendingHandler; + namespace TmwAthena { |