diff options
Diffstat (limited to 'src/net/eathena')
34 files changed, 27 insertions, 39 deletions
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 { |