From 8cf91f6df71db6a2c7ca114cc3a7c6666f63c4d0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 17 Sep 2014 11:34:24 +0300 Subject: Remove getter for playerHandler. --- src/net/net.cpp | 6 +----- src/net/net.h | 2 -- src/net/playerhandler.h | 2 ++ 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/net') diff --git a/src/net/net.cpp b/src/net/net.cpp index aee04a8e4..f11e4c3b6 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -56,6 +56,7 @@ namespace Net class NpcHandler; class PartyHandler; class PetHandler; + class PlayerHandler; } Net::AdminHandler *adminHandler = nullptr; @@ -81,11 +82,6 @@ Net::CashShopHandler *cashShopHandler = nullptr; Net::FamilyHandler *familyHandler = nullptr; Net::BankHandler *bankHandler = nullptr; -Net::PlayerHandler *Net::getPlayerHandler() -{ - return playerHandler; -} - Net::SkillHandler *Net::getSkillHandler() { return skillHandler; diff --git a/src/net/net.h b/src/net/net.h index f0611114f..7ddfd4364 100644 --- a/src/net/net.h +++ b/src/net/net.h @@ -36,12 +36,10 @@ namespace Net { -class PlayerHandler; class SkillHandler; class TradeHandler; class ServerFeatures; -PlayerHandler *getPlayerHandler() A_WARN_UNUSED; SkillHandler *getSkillHandler() A_WARN_UNUSED; TradeHandler *getTradeHandler() A_WARN_UNUSED; ServerFeatures *getServerFeatures() A_WARN_UNUSED; diff --git a/src/net/playerhandler.h b/src/net/playerhandler.h index 7f02ab625..fa4df6da3 100644 --- a/src/net/playerhandler.h +++ b/src/net/playerhandler.h @@ -103,4 +103,6 @@ class PlayerHandler notfinal } // namespace Net +extern Net::PlayerHandler *playerHandler; + #endif // NET_PLAYERHANDLER_H -- cgit v1.2.3-70-g09d2