summaryrefslogtreecommitdiff
path: root/src/net/manaserv
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/manaserv')
-rw-r--r--src/net/manaserv/adminhandler.cpp2
-rw-r--r--src/net/manaserv/adminhandler.h6
-rw-r--r--src/net/manaserv/beinghandler.h6
-rw-r--r--src/net/manaserv/buysellhandler.h6
-rw-r--r--src/net/manaserv/chathandler.h6
-rw-r--r--src/net/manaserv/gamehandler.h6
-rw-r--r--src/net/manaserv/generalhandler.h6
-rw-r--r--src/net/manaserv/guildhandler.h8
-rw-r--r--src/net/manaserv/inventoryhandler.h6
-rw-r--r--src/net/manaserv/loginhandler.h6
-rw-r--r--src/net/manaserv/npchandler.h6
-rw-r--r--src/net/manaserv/partyhandler.h7
-rw-r--r--src/net/manaserv/playerhandler.h6
-rw-r--r--src/net/manaserv/specialhandler.cpp2
-rw-r--r--src/net/manaserv/specialhandler.h6
-rw-r--r--src/net/manaserv/tradehandler.cpp4
-rw-r--r--src/net/manaserv/tradehandler.h8
17 files changed, 9 insertions, 88 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/adminhandler.h b/src/net/manaserv/adminhandler.h
index 17d296bd6..5a71db35e 100644
--- a/src/net/manaserv/adminhandler.h
+++ b/src/net/manaserv/adminhandler.h
@@ -26,12 +26,6 @@
#include "net/adminhandler.h"
#include "string"
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
namespace ManaServ
{
diff --git a/src/net/manaserv/beinghandler.h b/src/net/manaserv/beinghandler.h
index 512d3e58f..59797f8f5 100644
--- a/src/net/manaserv/beinghandler.h
+++ b/src/net/manaserv/beinghandler.h
@@ -30,12 +30,6 @@
#include "vector.h"
#include "map.h"
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
namespace ManaServ
{
diff --git a/src/net/manaserv/buysellhandler.h b/src/net/manaserv/buysellhandler.h
index b38fdd9e7..e1a9c91e5 100644
--- a/src/net/manaserv/buysellhandler.h
+++ b/src/net/manaserv/buysellhandler.h
@@ -27,12 +27,6 @@
#include "net/buysellhandler.h"
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
namespace ManaServ
{
diff --git a/src/net/manaserv/chathandler.h b/src/net/manaserv/chathandler.h
index 3ed7717ad..e93c2dd87 100644
--- a/src/net/manaserv/chathandler.h
+++ b/src/net/manaserv/chathandler.h
@@ -28,12 +28,6 @@
#include "net/manaserv/messagehandler.h"
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
namespace ManaServ
{
diff --git a/src/net/manaserv/gamehandler.h b/src/net/manaserv/gamehandler.h
index a38052205..323b2566a 100644
--- a/src/net/manaserv/gamehandler.h
+++ b/src/net/manaserv/gamehandler.h
@@ -28,12 +28,6 @@
#include "net/manaserv/messagehandler.h"
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
namespace ManaServ
{
diff --git a/src/net/manaserv/generalhandler.h b/src/net/manaserv/generalhandler.h
index ccdddbbe6..c6614707f 100644
--- a/src/net/manaserv/generalhandler.h
+++ b/src/net/manaserv/generalhandler.h
@@ -30,12 +30,6 @@
#include "net/manaserv/messagehandler.h"
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
namespace ManaServ
{
diff --git a/src/net/manaserv/guildhandler.h b/src/net/manaserv/guildhandler.h
index 023e60b08..6a8db27c8 100644
--- a/src/net/manaserv/guildhandler.h
+++ b/src/net/manaserv/guildhandler.h
@@ -27,12 +27,6 @@
#include "net/manaserv/messagehandler.h"
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
namespace ManaServ
{
@@ -62,7 +56,7 @@ public:
void memberList(int guildId);
- void info(int guildId A_UNUSED);
+ void info(int guildId);
void changeMemberPostion(GuildMember *member, int level);
diff --git a/src/net/manaserv/inventoryhandler.h b/src/net/manaserv/inventoryhandler.h
index fbe53d735..ba4535d79 100644
--- a/src/net/manaserv/inventoryhandler.h
+++ b/src/net/manaserv/inventoryhandler.h
@@ -29,12 +29,6 @@
#include "net/manaserv/messagehandler.h"
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
namespace ManaServ
{
diff --git a/src/net/manaserv/loginhandler.h b/src/net/manaserv/loginhandler.h
index e60f00d92..0e8f2a4e6 100644
--- a/src/net/manaserv/loginhandler.h
+++ b/src/net/manaserv/loginhandler.h
@@ -28,12 +28,6 @@
#include "net/manaserv/messagehandler.h"
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
class LoginData;
namespace ManaServ
diff --git a/src/net/manaserv/npchandler.h b/src/net/manaserv/npchandler.h
index f48e92ecb..f91858614 100644
--- a/src/net/manaserv/npchandler.h
+++ b/src/net/manaserv/npchandler.h
@@ -29,12 +29,6 @@
#include <map>
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
class NpcDialog;
namespace ManaServ
diff --git a/src/net/manaserv/partyhandler.h b/src/net/manaserv/partyhandler.h
index 89924c962..087936d72 100644
--- a/src/net/manaserv/partyhandler.h
+++ b/src/net/manaserv/partyhandler.h
@@ -27,16 +27,11 @@
#include "net/manaserv/messagehandler.h"
+#include "localconsts.h"
#include "party.h"
#include <string>
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
namespace ManaServ
{
diff --git a/src/net/manaserv/playerhandler.h b/src/net/manaserv/playerhandler.h
index f00fea42a..21bbac516 100644
--- a/src/net/manaserv/playerhandler.h
+++ b/src/net/manaserv/playerhandler.h
@@ -29,12 +29,6 @@
#include <guichan/actionlistener.hpp>
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
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/specialhandler.h b/src/net/manaserv/specialhandler.h
index e7931f8ea..ccbe59fd9 100644
--- a/src/net/manaserv/specialhandler.h
+++ b/src/net/manaserv/specialhandler.h
@@ -27,12 +27,6 @@
#include "net/manaserv/messagehandler.h"
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
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 35c260a8e..2ca542f78 100644
--- a/src/net/manaserv/tradehandler.h
+++ b/src/net/manaserv/tradehandler.h
@@ -27,12 +27,6 @@
#include "net/manaserv/messagehandler.h"
-#ifdef __GNUC__
-#define A_UNUSED __attribute__ ((unused))
-#else
-#define A_UNUSED
-#endif
-
namespace ManaServ
{
@@ -56,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);
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-07-01 05:10:22 +0000