From b10cb3ac1189eaa5f41184527eee342584231f84 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Wed, 17 Sep 2014 00:45:05 +0300 Subject: Remove getter for cachShopHandler. --- src/net/cashshophandler.h | 2 ++ src/net/net.cpp | 6 +----- src/net/net.h | 2 -- 3 files changed, 3 insertions(+), 7 deletions(-) (limited to 'src/net') diff --git a/src/net/cashshophandler.h b/src/net/cashshophandler.h index 73181f107..27ce3cfd7 100644 --- a/src/net/cashshophandler.h +++ b/src/net/cashshophandler.h @@ -37,4 +37,6 @@ class CashShopHandler notfinal } // namespace Net +extern Net::CashShopHandler *cashShopHandler; + #endif // NET_CACHSHOPHANDLER_H diff --git a/src/net/net.cpp b/src/net/net.cpp index 820066570..2330e8d5f 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -43,6 +43,7 @@ namespace Net class BankHandler; class BeingHandler; class BuySellHandler; + class CashShopHandler; } Net::AdminHandler *adminHandler = nullptr; @@ -143,11 +144,6 @@ Net::MailHandler *Net::getMailHandler() return mailHandler; } -Net::CashShopHandler *Net::getCashShopHandler() -{ - return cashShopHandler; -} - Net::FamilyHandler *Net::getFamilyHandler() { return familyHandler; diff --git a/src/net/net.h b/src/net/net.h index baf4c757d..f6029211c 100644 --- a/src/net/net.h +++ b/src/net/net.h @@ -36,7 +36,6 @@ namespace Net { -class CashShopHandler; class CharServerHandler; class ChatHandler; class FamilyHandler; @@ -69,7 +68,6 @@ SkillHandler *getSkillHandler() A_WARN_UNUSED; TradeHandler *getTradeHandler() A_WARN_UNUSED; ServerFeatures *getServerFeatures() A_WARN_UNUSED; MailHandler *getMailHandler() A_WARN_UNUSED; -CashShopHandler *getCashShopHandler() A_WARN_UNUSED; FamilyHandler *getFamilyHandler() A_WARN_UNUSED; ServerInfo::Type getNetworkType() A_WARN_UNUSED; -- cgit v1.2.3-60-g2f50