diff options
| author | Andrei Karas <akaras@inbox.ru> | 2014-09-17 11:59:03 +0300 |
|---|---|---|
| committer | Andrei Karas <akaras@inbox.ru> | 2014-09-17 11:59:03 +0300 |
| commit | 3aaebb5b7f1faf46d9f437ba00e7650147453952 (patch) | |
| tree | fa5f0949dd16db6b30b0132a02f33d3fe784acb0 /src/net | |
| parent | c81a850333f6e651e0dddb764e98a0fae45ca5f4 (diff) | |
| download | manaverse-3aaebb5b7f1faf46d9f437ba00e7650147453952.tar.gz manaverse-3aaebb5b7f1faf46d9f437ba00e7650147453952.tar.bz2 manaverse-3aaebb5b7f1faf46d9f437ba00e7650147453952.tar.xz manaverse-3aaebb5b7f1faf46d9f437ba00e7650147453952.zip | |
Remove getter for tradeHandler.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/net.cpp | 7 | ||||
| -rw-r--r-- | src/net/net.h | 4 | ||||
| -rw-r--r-- | src/net/tradehandler.h | 2 |
3 files changed, 3 insertions, 10 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp index 5dcbad577..237287fef 100644 --- a/src/net/net.cpp +++ b/src/net/net.cpp @@ -60,6 +60,7 @@ namespace Net class QuestHandler; class ServerFeatures; class SkillHandler; + class TradeHandler; } Net::AdminHandler *adminHandler = nullptr; @@ -86,12 +87,6 @@ Net::FamilyHandler *familyHandler = nullptr; Net::BankHandler *bankHandler = nullptr; Net::QuestHandler *questHandler = nullptr; -Net::TradeHandler *Net::getTradeHandler() -{ - return tradeHandler; -} - - namespace Net { ServerInfo::Type networkType = ServerInfo::UNKNOWN; diff --git a/src/net/net.h b/src/net/net.h index 4ec729cb3..12abe18a6 100644 --- a/src/net/net.h +++ b/src/net/net.h @@ -36,10 +36,6 @@ namespace Net { -class TradeHandler; - -TradeHandler *getTradeHandler() A_WARN_UNUSED; - ServerInfo::Type getNetworkType() A_WARN_UNUSED; /** diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h index 040d68179..737076e6a 100644 --- a/src/net/tradehandler.h +++ b/src/net/tradehandler.h @@ -68,4 +68,6 @@ class TradeHandler notfinal } // namespace Net +extern Net::TradeHandler *tradeHandler; + #endif // NET_TRADEHANDLER_H |