summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2009-10-29 22:10:44 +0100
committerThorbjørn Lindeijer <thorbjorn@lindeijer.nl>2009-10-29 22:10:44 +0100
commita5943d58c2fd81cc24e06cc44b55852a217d7c62 (patch)
tree1f432909379be2e719229a9c4f8b93cf17e431ac /src/net
parentc8bb01e2284b0570872be5f638b640d22ae247c8 (diff)
downloadmana-a5943d58c2fd81cc24e06cc44b55852a217d7c62.tar.gz
mana-a5943d58c2fd81cc24e06cc44b55852a217d7c62.tar.bz2
mana-a5943d58c2fd81cc24e06cc44b55852a217d7c62.tar.xz
mana-a5943d58c2fd81cc24e06cc44b55852a217d7c62.zip
Some random cleanups
Diffstat (limited to 'src/net')
-rw-r--r--src/net/charhandler.h4
-rw-r--r--src/net/ea/charserverhandler.cpp4
-rw-r--r--src/net/ea/gamehandler.cpp3
3 files changed, 5 insertions, 6 deletions
diff --git a/src/net/charhandler.h b/src/net/charhandler.h
index f3d7a6bc..4cace541 100644
--- a/src/net/charhandler.h
+++ b/src/net/charhandler.h
@@ -46,13 +46,13 @@ class CharHandler
virtual void getCharacters() = 0;
- virtual void chooseCharacter(int slot, LocalPlayer* character) = 0;
+ virtual void chooseCharacter(int slot, LocalPlayer *character) = 0;
virtual void newCharacter(const std::string &name, int slot,
bool gender, int hairstyle, int hairColor,
std::vector<int> stats) = 0;
- virtual void deleteCharacter(int slot, LocalPlayer* character) = 0;
+ virtual void deleteCharacter(int slot, LocalPlayer *character) = 0;
};
} // namespace Net
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 0f93efb8..b578fab9 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -257,7 +257,7 @@ void CharServerHandler::getCharacters()
connect();
}
-void CharServerHandler::chooseCharacter(int slot, LocalPlayer* character)
+void CharServerHandler::chooseCharacter(int slot, LocalPlayer *)
{
MessageOut outMsg(CMSG_CHAR_SELECT);
outMsg.writeInt8(slot);
@@ -277,7 +277,7 @@ void CharServerHandler::newCharacter(const std::string &name, int slot,
outMsg.writeInt16(hairstyle);
}
-void CharServerHandler::deleteCharacter(int slot, LocalPlayer* character)
+void CharServerHandler::deleteCharacter(int slot, LocalPlayer *character)
{
MessageOut outMsg(CMSG_CHAR_DELETE);
outMsg.writeInt32(character->getId());
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index a3c0ad3a..012e6f8c 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -59,12 +59,11 @@ GameHandler::GameHandler()
void GameHandler::handleMessage(MessageIn &msg)
{
- unsigned char direction;
-
switch (msg.getId())
{
case SMSG_MAP_LOGIN_SUCCESS:
{
+ unsigned char direction;
Uint16 x, y;
msg.readInt32(); // server tick
msg.readCoordinates(x, y, direction);