summaryrefslogtreecommitdiff
path: root/src/net/manaserv
diff options
context:
space:
mode:
Diffstat (limited to 'src/net/manaserv')
-rw-r--r--src/net/manaserv/chathandler.cpp11
-rw-r--r--src/net/manaserv/chathandler.h4
-rw-r--r--src/net/manaserv/network.cpp6
-rw-r--r--src/net/manaserv/partyhandler.cpp2
4 files changed, 18 insertions, 5 deletions
diff --git a/src/net/manaserv/chathandler.cpp b/src/net/manaserv/chathandler.cpp
index 16552018e..1757b565d 100644
--- a/src/net/manaserv/chathandler.cpp
+++ b/src/net/manaserv/chathandler.cpp
@@ -470,4 +470,15 @@ void ChatHandler::sendRaw(const std::string &args A_UNUSED)
{
}
+
+void ChatHandler::ignoreAll()
+{
+
+}
+
+void ChatHandler::unIgnoreAll()
+{
+
+}
+
} // namespace ManaServ
diff --git a/src/net/manaserv/chathandler.h b/src/net/manaserv/chathandler.h
index beea40423..3ed7717ad 100644
--- a/src/net/manaserv/chathandler.h
+++ b/src/net/manaserv/chathandler.h
@@ -134,9 +134,9 @@ class ChatHandler : public MessageHandler, public Net::ChatHandler
*/
void handleWhoResponse(Net::MessageIn &msg);
- void ignoreAll()
+ void ignoreAll();
- void unIgnoreAll()
+ void unIgnoreAll();
};
} // namespace ManaServ
diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp
index b83bc5748..44478fb4c 100644
--- a/src/net/manaserv/network.cpp
+++ b/src/net/manaserv/network.cpp
@@ -33,6 +33,8 @@
#include <map>
+#include "debug.h"
+
/**
* The local host which is shared for all outgoing connections.
*/
@@ -56,9 +58,9 @@ void initialize()
}
#if defined(ENET_VERSION) && ENET_VERSION >= ENET_CUTOFF
- client = enet_host_create(NULL, 3, 0, 0, 0);
+ client = enet_host_create(nullptr, 3, 0, 0, 0);
#else
- client = enet_host_create(NULL, 3, 0, 0);
+ client = enet_host_create(nullptr, 3, 0, 0);
#endif
if (!client)
diff --git a/src/net/manaserv/partyhandler.cpp b/src/net/manaserv/partyhandler.cpp
index 987a40dc5..660657f44 100644
--- a/src/net/manaserv/partyhandler.cpp
+++ b/src/net/manaserv/partyhandler.cpp
@@ -96,7 +96,7 @@ void PartyHandler::handleMessage(Net::MessageIn &msg)
if (msg.readInt8() == ERRMSG_OK)
{
mParty->clearMembers();
- player_node->setParty(NULL);
+ player_node->setParty(nullptr);
}
} break;