summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2014-09-16 23:56:49 +0300
committerAndrei Karas <akaras@inbox.ru>2014-09-17 00:02:02 +0300
commit9b25edfe24395fdee2ad06c85a0f9c0a6117aaa8 (patch)
treea1116647b9e40fe8a7f710e09434301da137a785 /src/net
parentf5c479fa193fb4199872aabcb73d35f872caa87f (diff)
downloadmv-9b25edfe24395fdee2ad06c85a0f9c0a6117aaa8.tar.gz
mv-9b25edfe24395fdee2ad06c85a0f9c0a6117aaa8.tar.bz2
mv-9b25edfe24395fdee2ad06c85a0f9c0a6117aaa8.tar.xz
mv-9b25edfe24395fdee2ad06c85a0f9c0a6117aaa8.zip
Remove getter for adminHandler.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/adminhandler.h2
-rw-r--r--src/net/net.cpp10
-rw-r--r--src/net/net.h2
3 files changed, 7 insertions, 7 deletions
diff --git a/src/net/adminhandler.h b/src/net/adminhandler.h
index e6565e4a6..eca316210 100644
--- a/src/net/adminhandler.h
+++ b/src/net/adminhandler.h
@@ -94,4 +94,6 @@ class AdminHandler notfinal
} // namespace Net
+extern Net::AdminHandler *adminHandler;
+
#endif // NET_ADMINHANDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 6a0ac33a3..520c794db 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -36,6 +36,11 @@
#include "debug.h"
+namespace Net
+{
+ class AdminHandler;
+}
+
Net::AdminHandler *adminHandler = nullptr;
Net::CharServerHandler *charServerHandler = nullptr;
Net::ChatHandler *chatHandler = nullptr;
@@ -59,11 +64,6 @@ Net::CashShopHandler *cashShopHandler = nullptr;
Net::FamilyHandler *familyHandler = nullptr;
Net::BankHandler *bankHandler = nullptr;
-Net::AdminHandler *Net::getAdminHandler()
-{
- return adminHandler;
-}
-
Net::CharServerHandler *Net::getCharServerHandler()
{
return charServerHandler;
diff --git a/src/net/net.h b/src/net/net.h
index d1872e052..4581e9946 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -36,7 +36,6 @@
namespace Net
{
-class AdminHandler;
class AuctionHandler;
class BankHandler;
class BeingHandler;
@@ -59,7 +58,6 @@ class TradeHandler;
class BuySellHandler;
class ServerFeatures;
-AdminHandler *getAdminHandler() A_WARN_UNUSED;
BeingHandler *getBeingHandler() A_WARN_UNUSED;
CharServerHandler *getCharServerHandler() A_WARN_UNUSED;
ChatHandler *getChatHandler() A_WARN_UNUSED;