summaryrefslogtreecommitdiff
path: root/src/net/manaserv
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
committerAndrei Karas <akaras@inbox.ru>2011-11-07 19:34:52 +0300
commit9e83411f7e4147d09af5a5006888dcc187ea0ef8 (patch)
treec084bdf8afabc6220779645dcb5dbf71af6a151f /src/net/manaserv
parentbc7d91cc0c9c0f6dcad01d612932c6899afb5514 (diff)
downloadplus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.gz
plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.bz2
plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.tar.xz
plus-9e83411f7e4147d09af5a5006888dcc187ea0ef8.zip
Fix some warnings under gcc 4.7.
Diffstat (limited to 'src/net/manaserv')
-rw-r--r--src/net/manaserv/network.cpp4
-rw-r--r--src/net/manaserv/partyhandler.cpp2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/net/manaserv/network.cpp b/src/net/manaserv/network.cpp
index b83bc5748..3303934bd 100644
--- a/src/net/manaserv/network.cpp
+++ b/src/net/manaserv/network.cpp
@@ -56,9 +56,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;