diff options
Diffstat (limited to 'src')
77 files changed, 65 insertions, 88 deletions
diff --git a/src/actions/tabs.cpp b/src/actions/tabs.cpp index dc88595eb..99d964b40 100644 --- a/src/actions/tabs.cpp +++ b/src/actions/tabs.cpp @@ -28,8 +28,6 @@ #include "debug.h" -extern ShortcutWindow *spellShortcutWindow; - namespace Actions { diff --git a/src/actions/windows.cpp b/src/actions/windows.cpp index 3e429faea..1cc9548c5 100644 --- a/src/actions/windows.cpp +++ b/src/actions/windows.cpp @@ -57,8 +57,6 @@ #include "debug.h" -extern ShortcutWindow *spellShortcutWindow; - namespace Actions { diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp index c675ad32e..061945c0c 100644 --- a/src/being/localplayer.cpp +++ b/src/being/localplayer.cpp @@ -108,11 +108,9 @@ LocalPlayer *localPlayer = nullptr; class SkillDialog; -extern std::list<BeingCacheEntry*> beingInfoCache; extern OkDialog *weightNotice; extern time_t weightNoticeTime; -extern MiniStatusWindow *miniStatusWindow; -extern SkillDialog *skillDialog; + LocalPlayer::LocalPlayer(const BeingId id, const BeingTypeId subtype) : diff --git a/src/gui/viewport.cpp b/src/gui/viewport.cpp index 3fb80fd33..28d66975d 100644 --- a/src/gui/viewport.cpp +++ b/src/gui/viewport.cpp @@ -61,7 +61,6 @@ Viewport *viewport = nullptr; extern volatile int tick_time; -extern MiniStatusWindow *miniStatusWindow; Viewport::Viewport() : WindowContainer(nullptr), diff --git a/src/gui/widgets/browserbox_unittest.cc b/src/gui/widgets/browserbox_unittest.cc index f4a27c1e8..b3f536452 100644 --- a/src/gui/widgets/browserbox_unittest.cc +++ b/src/gui/widgets/browserbox_unittest.cc @@ -47,7 +47,7 @@ #include "debug.h" -extern const char *dirSeparator; + TEST_CASE("BrowserBox leak test1", "") { diff --git a/src/gui/widgets/tabs/setup_joystick.cpp b/src/gui/widgets/tabs/setup_joystick.cpp index 12cf331a0..490205b4b 100644 --- a/src/gui/widgets/tabs/setup_joystick.cpp +++ b/src/gui/widgets/tabs/setup_joystick.cpp @@ -40,8 +40,6 @@ #include "debug.h" -extern Joystick *joystick; - Setup_Joystick::Setup_Joystick(const Widget2 *const widget) : SetupTab(widget), mCalibrateLabel(new Label(this, diff --git a/src/gui/widgets/tabs/setup_video.cpp b/src/gui/widgets/tabs/setup_video.cpp index b11b20f39..785ab5a33 100644 --- a/src/gui/widgets/tabs/setup_video.cpp +++ b/src/gui/widgets/tabs/setup_video.cpp @@ -61,8 +61,6 @@ #include "debug.h" -extern Graphics *mainGraphics; - Setup_Video::Setup_Video(const Widget2 *const widget) : SetupTab(widget), KeyListener(), diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp index 4abb9bf7a..a64d70a46 100644 --- a/src/net/ea/charserverhandler.cpp +++ b/src/net/ea/charserverhandler.cpp @@ -31,7 +31,7 @@ #include "debug.h" -extern Net::CharServerHandler *charServerHandler; + namespace Ea { diff --git a/src/net/ea/traderecv.cpp b/src/net/ea/traderecv.cpp index dc2d60322..9b5799c69 100644 --- a/src/net/ea/traderecv.cpp +++ b/src/net/ea/traderecv.cpp @@ -42,7 +42,7 @@ #include "debug.h" -extern std::string tradePartnerName; + ConfirmDialog *confirmDlg = nullptr; /** diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp index ac15da627..8a88f15d4 100644 --- a/src/net/eathena/adminhandler.cpp +++ b/src/net/eathena/adminhandler.cpp @@ -32,7 +32,7 @@ #include "debug.h" -extern Net::AdminHandler *adminHandler; + namespace EAthena { diff --git a/src/net/eathena/auctionhandler.cpp b/src/net/eathena/auctionhandler.cpp index 84b7c6b0d..ddae97485 100644 --- a/src/net/eathena/auctionhandler.cpp +++ b/src/net/eathena/auctionhandler.cpp @@ -29,7 +29,7 @@ #include "debug.h" -extern Net::AuctionHandler *auctionHandler; + namespace EAthena { diff --git a/src/net/eathena/bankhandler.cpp b/src/net/eathena/bankhandler.cpp index 7270e25a4..8c73bad91 100644 --- a/src/net/eathena/bankhandler.cpp +++ b/src/net/eathena/bankhandler.cpp @@ -25,7 +25,6 @@ #include "debug.h" -extern Net::BankHandler *bankHandler; extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/battlegroundhandler.cpp b/src/net/eathena/battlegroundhandler.cpp index 0b805f5be..961e3781e 100644 --- a/src/net/eathena/battlegroundhandler.cpp +++ b/src/net/eathena/battlegroundhandler.cpp @@ -25,7 +25,7 @@ #include "debug.h" -extern Net::BattleGroundHandler *battleGroundHandler; + extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp index 632485e7d..80a62e38e 100644 --- a/src/net/eathena/beinghandler.cpp +++ b/src/net/eathena/beinghandler.cpp @@ -28,7 +28,7 @@ #include "debug.h" -extern Net::BeingHandler *beingHandler; + extern int packetVersion; extern int serverVersion; diff --git a/src/net/eathena/buyingstorehandler.cpp b/src/net/eathena/buyingstorehandler.cpp index 8bd3392a0..518e1bfaa 100644 --- a/src/net/eathena/buyingstorehandler.cpp +++ b/src/net/eathena/buyingstorehandler.cpp @@ -32,7 +32,7 @@ #include "debug.h" -extern Net::BuyingStoreHandler *buyingStoreHandler; + extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp index 6ab5deb5e..3bf349cc0 100644 --- a/src/net/eathena/buysellhandler.cpp +++ b/src/net/eathena/buysellhandler.cpp @@ -29,7 +29,7 @@ #include "debug.h" -extern Net::BuySellHandler *buySellHandler; + extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/cashshophandler.cpp b/src/net/eathena/cashshophandler.cpp index 40e23d3a5..9928c1a94 100644 --- a/src/net/eathena/cashshophandler.cpp +++ b/src/net/eathena/cashshophandler.cpp @@ -28,7 +28,7 @@ #include "debug.h" -extern Net::CashShopHandler *cashShopHandler; + extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp index 22fbe000a..219961ba7 100644 --- a/src/net/eathena/charserverhandler.cpp +++ b/src/net/eathena/charserverhandler.cpp @@ -37,7 +37,7 @@ #include "debug.h" -extern Net::CharServerHandler *charServerHandler; + extern int packetVersion; extern int serverVersion; diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp index ab6e12ae7..f11a84efa 100644 --- a/src/net/eathena/charserverrecv.cpp +++ b/src/net/eathena/charserverrecv.cpp @@ -54,9 +54,9 @@ #include "debug.h" -extern Net::CharServerHandler *charServerHandler; + extern int packetVersion; -extern int serverVersion; + namespace EAthena { diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp index f5f6760f1..cf40d215d 100644 --- a/src/net/eathena/chathandler.cpp +++ b/src/net/eathena/chathandler.cpp @@ -38,7 +38,7 @@ #include "debug.h" -extern Net::ChatHandler *chatHandler; + extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/elementalhandler.cpp b/src/net/eathena/elementalhandler.cpp index c80a47b99..4bdc8beb1 100644 --- a/src/net/eathena/elementalhandler.cpp +++ b/src/net/eathena/elementalhandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::ElementalHandler *elementalHandler; + namespace EAthena { diff --git a/src/net/eathena/familyhandler.cpp b/src/net/eathena/familyhandler.cpp index 1a71c086d..e475503f0 100644 --- a/src/net/eathena/familyhandler.cpp +++ b/src/net/eathena/familyhandler.cpp @@ -28,8 +28,6 @@ #include "debug.h" -extern Net::FamilyHandler *familyHandler; - namespace EAthena { diff --git a/src/net/eathena/friendshandler.cpp b/src/net/eathena/friendshandler.cpp index d34a78235..e18f179bf 100644 --- a/src/net/eathena/friendshandler.cpp +++ b/src/net/eathena/friendshandler.cpp @@ -25,8 +25,6 @@ #include "debug.h" -extern Net::FriendsHandler *friendsHandler; - namespace EAthena { diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp index 8a169de60..c80a11cd3 100644 --- a/src/net/eathena/gamehandler.cpp +++ b/src/net/eathena/gamehandler.cpp @@ -39,7 +39,7 @@ #include "debug.h" -extern Net::GameHandler *gameHandler; + extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp index cfe77bc09..a5c14c67f 100644 --- a/src/net/eathena/generalhandler.cpp +++ b/src/net/eathena/generalhandler.cpp @@ -72,7 +72,7 @@ #include "debug.h" -extern Net::GeneralHandler *generalHandler; + namespace EAthena { diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp index f2c90e874..83182f0b2 100644 --- a/src/net/eathena/guildhandler.cpp +++ b/src/net/eathena/guildhandler.cpp @@ -38,7 +38,7 @@ GuildTab *guildTab = nullptr; -extern Net::GuildHandler *guildHandler; + extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/homunculushandler.cpp b/src/net/eathena/homunculushandler.cpp index 8c454be6f..832ddb3be 100644 --- a/src/net/eathena/homunculushandler.cpp +++ b/src/net/eathena/homunculushandler.cpp @@ -29,7 +29,7 @@ #include "debug.h" -extern Net::HomunculusHandler *homunculusHandler; + extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp index 6a5152fad..ae4c68b89 100644 --- a/src/net/eathena/inventoryhandler.cpp +++ b/src/net/eathena/inventoryhandler.cpp @@ -35,7 +35,7 @@ #include "debug.h" -extern Net::InventoryHandler *inventoryHandler; + extern int packetVersion; // this conversion from bit corrupted LOOK_* to EquipSlot diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp index f6ebe8e45..78d5d54ff 100644 --- a/src/net/eathena/loginhandler.cpp +++ b/src/net/eathena/loginhandler.cpp @@ -35,7 +35,7 @@ #include "debug.h" -extern Net::LoginHandler *loginHandler; + namespace EAthena { diff --git a/src/net/eathena/mailhandler.cpp b/src/net/eathena/mailhandler.cpp index dbd97e3b3..f00497def 100644 --- a/src/net/eathena/mailhandler.cpp +++ b/src/net/eathena/mailhandler.cpp @@ -27,7 +27,7 @@ #include "debug.h" -extern Net::MailHandler *mailHandler; + namespace EAthena { diff --git a/src/net/eathena/maphandler.cpp b/src/net/eathena/maphandler.cpp index 380b5c48c..c8d65509b 100644 --- a/src/net/eathena/maphandler.cpp +++ b/src/net/eathena/maphandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::MapHandler *mapHandler; + namespace EAthena { diff --git a/src/net/eathena/markethandler.cpp b/src/net/eathena/markethandler.cpp index a75aec961..a9a884ad3 100644 --- a/src/net/eathena/markethandler.cpp +++ b/src/net/eathena/markethandler.cpp @@ -28,7 +28,6 @@ #include "debug.h" -extern Net::MarketHandler *marketHandler; extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp index fe14587db..56e458a1c 100644 --- a/src/net/eathena/mercenaryhandler.cpp +++ b/src/net/eathena/mercenaryhandler.cpp @@ -29,7 +29,7 @@ #include "debug.h" -extern Net::MercenaryHandler *mercenaryHandler; + namespace EAthena { diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp index 85349ce9d..0790cbfcf 100644 --- a/src/net/eathena/npchandler.cpp +++ b/src/net/eathena/npchandler.cpp @@ -43,7 +43,7 @@ #include "debug.h" -extern Net::NpcHandler *npcHandler; + extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp index dd0309f0d..231aa61f9 100644 --- a/src/net/eathena/partyhandler.cpp +++ b/src/net/eathena/partyhandler.cpp @@ -37,7 +37,7 @@ #include "debug.h" -extern Net::PartyHandler *partyHandler; + extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/pethandler.cpp b/src/net/eathena/pethandler.cpp index 602f9cd88..b4a88c027 100644 --- a/src/net/eathena/pethandler.cpp +++ b/src/net/eathena/pethandler.cpp @@ -29,7 +29,7 @@ #include "debug.h" -extern Net::PetHandler *petHandler; + namespace EAthena { diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp index ef7afa6e4..86274c272 100644 --- a/src/net/eathena/playerhandler.cpp +++ b/src/net/eathena/playerhandler.cpp @@ -44,7 +44,7 @@ #include "debug.h" -extern Net::PlayerHandler *playerHandler; + extern int packetVersion; extern int serverVersion; diff --git a/src/net/eathena/roulettehandler.cpp b/src/net/eathena/roulettehandler.cpp index 5804e1b70..2f9b52205 100644 --- a/src/net/eathena/roulettehandler.cpp +++ b/src/net/eathena/roulettehandler.cpp @@ -22,7 +22,7 @@ #include "debug.h" -extern Net::RouletteHandler *rouletteHandler; + namespace EAthena { diff --git a/src/net/eathena/searchstorehandler.cpp b/src/net/eathena/searchstorehandler.cpp index d0b98be08..b39577d3c 100644 --- a/src/net/eathena/searchstorehandler.cpp +++ b/src/net/eathena/searchstorehandler.cpp @@ -25,7 +25,7 @@ #include "debug.h" -extern Net::SearchStoreHandler *searchStoreHandler; + extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/serverfeatures.cpp b/src/net/eathena/serverfeatures.cpp index d7bf16bd0..ff6133eb1 100644 --- a/src/net/eathena/serverfeatures.cpp +++ b/src/net/eathena/serverfeatures.cpp @@ -25,7 +25,6 @@ #include "debug.h" extern int serverVersion; -extern Net::ServerFeatures *serverFeatures; namespace EAthena { diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp index 7fc52c17a..f3acb257f 100644 --- a/src/net/eathena/skillhandler.cpp +++ b/src/net/eathena/skillhandler.cpp @@ -28,7 +28,6 @@ #include "debug.h" -extern Net::SkillHandler *skillHandler; extern int packetVersion; namespace EAthena diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp index 65cb72cc8..94ea4fb9d 100644 --- a/src/net/eathena/tradehandler.cpp +++ b/src/net/eathena/tradehandler.cpp @@ -34,8 +34,6 @@ #include "debug.h" -extern Net::TradeHandler *tradeHandler; - namespace EAthena { TradeHandler::TradeHandler() : diff --git a/src/net/eathena/vendinghandler.cpp b/src/net/eathena/vendinghandler.cpp index e9d0643a3..b95b162b4 100644 --- a/src/net/eathena/vendinghandler.cpp +++ b/src/net/eathena/vendinghandler.cpp @@ -33,8 +33,6 @@ #include "debug.h" -extern Net::VendingHandler *vendingHandler; - namespace EAthena { 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 { |