summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-25 03:54:52 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-25 03:55:21 +0300
commit0b7bc2e702637f7f2e4dd25552aa69831525e58f (patch)
tree85f9909375131c8128324ec5d6c77a13912d4ebf /src
parent34a492ac70b3217937eafeb6db3cb9bfdc18fba9 (diff)
downloadmv-0b7bc2e702637f7f2e4dd25552aa69831525e58f.tar.gz
mv-0b7bc2e702637f7f2e4dd25552aa69831525e58f.tar.bz2
mv-0b7bc2e702637f7f2e4dd25552aa69831525e58f.tar.xz
mv-0b7bc2e702637f7f2e4dd25552aa69831525e58f.zip
Fix compilation errors and warnings in manaserv code.
Diffstat (limited to 'src')
-rw-r--r--src/net/manaserv/adminhandler.cpp2
-rw-r--r--src/net/manaserv/specialhandler.cpp2
-rw-r--r--src/net/manaserv/tradehandler.cpp4
-rw-r--r--src/net/manaserv/tradehandler.h2
4 files changed, 7 insertions, 3 deletions
diff --git a/src/net/manaserv/adminhandler.cpp b/src/net/manaserv/adminhandler.cpp
index a8860d73b..a7bcf6355 100644
--- a/src/net/manaserv/adminhandler.cpp
+++ b/src/net/manaserv/adminhandler.cpp
@@ -26,6 +26,8 @@
#include "net/manaserv/messageout.h"
#include "net/manaserv/protocol.h"
+#include "debug.h"
+
extern Net::AdminHandler *adminHandler;
namespace ManaServ
diff --git a/src/net/manaserv/specialhandler.cpp b/src/net/manaserv/specialhandler.cpp
index de45c2144..85fe7271f 100644
--- a/src/net/manaserv/specialhandler.cpp
+++ b/src/net/manaserv/specialhandler.cpp
@@ -27,6 +27,8 @@
#include "net/manaserv/messageout.h"
#include "net/manaserv/protocol.h"
+#include "debug.h"
+
extern Net::SpecialHandler *specialHandler;
namespace ManaServ
diff --git a/src/net/manaserv/tradehandler.cpp b/src/net/manaserv/tradehandler.cpp
index be38e4019..383da9fe6 100644
--- a/src/net/manaserv/tradehandler.cpp
+++ b/src/net/manaserv/tradehandler.cpp
@@ -100,9 +100,9 @@ TradeHandler::TradeHandler():
tradeHandler = this;
}
-void TradeHandler::setAcceptTradeRequests(bool acceptTradeRequests)
+void TradeHandler::setAcceptTradeRequests(bool acceptRequests)
{
- mAcceptTradeRequests = acceptTradeRequests;
+ mAcceptTradeRequests = acceptRequests;
if (mAcceptTradeRequests)
SERVER_NOTICE(_("Accepting incoming trade requests."))
else
diff --git a/src/net/manaserv/tradehandler.h b/src/net/manaserv/tradehandler.h
index b5fcb3d3f..2ca542f78 100644
--- a/src/net/manaserv/tradehandler.h
+++ b/src/net/manaserv/tradehandler.h
@@ -50,7 +50,7 @@ class TradeHandler : public MessageHandler, public Net::TradeHandler
* requests are automatically denied. When true, a popup will ask the
* player whether he wants to trade.
*/
- void setAcceptTradeRequests(bool acceptTradeRequests);
+ void setAcceptTradeRequests(bool acceptRequests);
void request(Being *being);