summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-17 11:24:41 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-17 11:24:41 +0300
commit4eaedf092bc504fae492827b1a89e7bbaac20263 (patch)
tree098d1b1a7721606a8c053dc56f9e9765b8072c9e /src/net
parent418d749f0d4889904d0b91e825a87e70a08d134c (diff)
downloadplus-4eaedf092bc504fae492827b1a89e7bbaac20263.tar.gz
plus-4eaedf092bc504fae492827b1a89e7bbaac20263.tar.bz2
plus-4eaedf092bc504fae492827b1a89e7bbaac20263.tar.xz
plus-4eaedf092bc504fae492827b1a89e7bbaac20263.zip
Remove getter for petHandler.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/net.cpp6
-rw-r--r--src/net/net.h2
-rw-r--r--src/net/pethandler.h2
3 files changed, 3 insertions, 7 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 34e4eb345..aee04a8e4 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -55,6 +55,7 @@ namespace Net
class MailHandler;
class NpcHandler;
class PartyHandler;
+ class PetHandler;
}
Net::AdminHandler *adminHandler = nullptr;
@@ -80,11 +81,6 @@ Net::CashShopHandler *cashShopHandler = nullptr;
Net::FamilyHandler *familyHandler = nullptr;
Net::BankHandler *bankHandler = nullptr;
-Net::PetHandler *Net::getPetHandler()
-{
- return petHandler;
-}
-
Net::PlayerHandler *Net::getPlayerHandler()
{
return playerHandler;
diff --git a/src/net/net.h b/src/net/net.h
index 8dd94792b..f0611114f 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -36,13 +36,11 @@
namespace Net
{
-class PetHandler;
class PlayerHandler;
class SkillHandler;
class TradeHandler;
class ServerFeatures;
-PetHandler *getPetHandler() A_WARN_UNUSED;
PlayerHandler *getPlayerHandler() A_WARN_UNUSED;
SkillHandler *getSkillHandler() A_WARN_UNUSED;
TradeHandler *getTradeHandler() A_WARN_UNUSED;
diff --git a/src/net/pethandler.h b/src/net/pethandler.h
index 3a90b98f1..8827a63e8 100644
--- a/src/net/pethandler.h
+++ b/src/net/pethandler.h
@@ -52,4 +52,6 @@ class PetHandler notfinal
} // namespace Net
+extern Net::PetHandler *petHandler;
+
#endif // NET_PETHANDLER_H