summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2007-11-21 15:30:11 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2007-11-21 15:30:11 +0000
commit1f6975d34e2c6fe8404fcbe13da406e624d94b68 (patch)
treeace660d018fada5ffa7b19c6d60060c9009238c0 /src/net
parent6b4436ee8d777f720f80a3436e30f34213258810 (diff)
downloadmana-client-1f6975d34e2c6fe8404fcbe13da406e624d94b68.tar.gz
mana-client-1f6975d34e2c6fe8404fcbe13da406e624d94b68.tar.bz2
mana-client-1f6975d34e2c6fe8404fcbe13da406e624d94b68.tar.xz
mana-client-1f6975d34e2c6fe8404fcbe13da406e624d94b68.zip
Small lingering changes made while merging to 0.0.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/charserverhandler.cpp14
1 files changed, 5 insertions, 9 deletions
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index 76311266..0082db4c 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -24,8 +24,8 @@
#include "charserverhandler.h"
#include "connection.h"
-#include "protocol.h"
#include "messagein.h"
+#include "protocol.h"
#include "../game.h"
#include "../localplayer.h"
@@ -52,8 +52,7 @@ CharServerHandler::CharServerHandler():
handledMessages = _messages;
}
-void
-CharServerHandler::handleMessage(MessageIn &msg)
+void CharServerHandler::handleMessage(MessageIn &msg)
{
int slot;
LocalPlayer *tempPlayer;
@@ -116,8 +115,7 @@ CharServerHandler::handleMessage(MessageIn &msg)
}
}
-void
-CharServerHandler::handleCharCreateResponse(MessageIn &msg)
+void CharServerHandler::handleCharCreateResponse(MessageIn &msg)
{
int errMsg = msg.readByte();
@@ -168,8 +166,7 @@ CharServerHandler::handleCharCreateResponse(MessageIn &msg)
mCharCreateDialog->unlock();
}
-void
-CharServerHandler::handleCharSelectResponse(MessageIn &msg)
+void CharServerHandler::handleCharSelectResponse(MessageIn &msg)
{
int errMsg = msg.readByte();
@@ -210,8 +207,7 @@ CharServerHandler::handleCharSelectResponse(MessageIn &msg)
}
}
-LocalPlayer*
-CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
+LocalPlayer* CharServerHandler::readPlayerData(MessageIn &msg, int &slot)
{
LocalPlayer *tempPlayer = new LocalPlayer;
slot = msg.readByte(); // character slot