summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-17 11:14:13 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-17 11:14:13 +0300
commitdc5766216ee50103909d3b5dcdc5747c149855e0 (patch)
treedb7960089152805498449c0f1b2a392d36543607 /src/net
parent85c6d5c89ca967020e1a0818c9fa80c065873cc1 (diff)
downloadmv-dc5766216ee50103909d3b5dcdc5747c149855e0.tar.gz
mv-dc5766216ee50103909d3b5dcdc5747c149855e0.tar.bz2
mv-dc5766216ee50103909d3b5dcdc5747c149855e0.tar.xz
mv-dc5766216ee50103909d3b5dcdc5747c149855e0.zip
Remove getter for npcHandler.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/net.cpp6
-rw-r--r--src/net/net.h2
-rw-r--r--src/net/npchandler.h2
3 files changed, 3 insertions, 7 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 4e904778c..ee375cfc3 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -53,6 +53,7 @@ namespace Net
class InventoryHandler;
class LoginHandler;
class MailHandler;
+ class NpcHandler;
}
Net::AdminHandler *adminHandler = nullptr;
@@ -78,11 +79,6 @@ Net::CashShopHandler *cashShopHandler = nullptr;
Net::FamilyHandler *familyHandler = nullptr;
Net::BankHandler *bankHandler = nullptr;
-Net::NpcHandler *Net::getNpcHandler()
-{
- return npcHandler;
-}
-
Net::PartyHandler *Net::getPartyHandler()
{
return partyHandler;
diff --git a/src/net/net.h b/src/net/net.h
index b1e6a52ca..e550cfc75 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -36,7 +36,6 @@
namespace Net
{
-class NpcHandler;
class PartyHandler;
class PetHandler;
class PlayerHandler;
@@ -44,7 +43,6 @@ class SkillHandler;
class TradeHandler;
class ServerFeatures;
-NpcHandler *getNpcHandler() A_WARN_UNUSED;
PartyHandler *getPartyHandler() A_WARN_UNUSED;
PetHandler *getPetHandler() A_WARN_UNUSED;
PlayerHandler *getPlayerHandler() A_WARN_UNUSED;
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index 9dfc7dbbc..706f6d7c3 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -93,4 +93,6 @@ class NpcHandler notfinal
} // namespace Net
+extern Net::NpcHandler *npcHandler;
+
#endif // NET_NPCHANDLER_H