summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-17 11:34:24 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-17 11:34:24 +0300
commit8cf91f6df71db6a2c7ca114cc3a7c6666f63c4d0 (patch)
treec55088930bdf1ff0b7fe1f4d6f9219ca6c55e9c9 /src/net
parent4eaedf092bc504fae492827b1a89e7bbaac20263 (diff)
downloadplus-8cf91f6df71db6a2c7ca114cc3a7c6666f63c4d0.tar.gz
plus-8cf91f6df71db6a2c7ca114cc3a7c6666f63c4d0.tar.bz2
plus-8cf91f6df71db6a2c7ca114cc3a7c6666f63c4d0.tar.xz
plus-8cf91f6df71db6a2c7ca114cc3a7c6666f63c4d0.zip
Remove getter for playerHandler.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/net.cpp6
-rw-r--r--src/net/net.h2
-rw-r--r--src/net/playerhandler.h2
3 files changed, 3 insertions, 7 deletions
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