summaryrefslogtreecommitdiff
path: root/src/net
diff options
context:
space:
mode:
authorBjørn Lindeijer <bjorn@lindeijer.nl>2006-08-01 21:10:13 +0000
committerBjørn Lindeijer <bjorn@lindeijer.nl>2006-08-01 21:10:13 +0000
commit2ae843719c2a7b2325309404a0e3cbb4aeb9c3df (patch)
tree4491254c4532f767585ed0001d5652994a7e9ae6 /src/net
parentc2cde930ed189d70846bf86acfddf6fdd0c998f9 (diff)
downloadmana-2ae843719c2a7b2325309404a0e3cbb4aeb9c3df.tar.gz
mana-2ae843719c2a7b2325309404a0e3cbb4aeb9c3df.tar.bz2
mana-2ae843719c2a7b2325309404a0e3cbb4aeb9c3df.tar.xz
mana-2ae843719c2a7b2325309404a0e3cbb4aeb9c3df.zip
Fixed several compiler warnings and a linker error when compiling without
OpenGL support.
Diffstat (limited to 'src/net')
-rw-r--r--src/net/beinghandler.cpp18
-rw-r--r--src/net/maploginhandler.cpp6
-rw-r--r--src/net/protocol.h2
3 files changed, 13 insertions, 13 deletions
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp
index 7730e9be..549797f9 100644
--- a/src/net/beinghandler.cpp
+++ b/src/net/beinghandler.cpp
@@ -129,12 +129,12 @@ void BeingHandler::handleMessage(MessageIn *msg)
if (msg->getId() == SMSG_BEING_MOVE)
{
- Uint16 srcX, srcY, dstX, dstY;
+ //Uint16 srcX, srcY, dstX, dstY;
//msg->readCoordinatePair(srcX, srcY, dstX, dstY);
- dstBeing->setAction(Being::STAND);
- dstBeing->mX = srcX;
- dstBeing->mY = srcY;
- dstBeing->setDestination(dstX, dstY);
+ //dstBeing->setAction(Being::STAND);
+ //dstBeing->mX = srcX;
+ //dstBeing->mY = srcY;
+ //dstBeing->setDestination(dstX, dstY);
}
else
{
@@ -333,11 +333,11 @@ void BeingHandler::handleMessage(MessageIn *msg)
if (msg->getId() == SMSG_PLAYER_MOVE)
{
- Uint16 srcX, srcY, dstX, dstY;
+ //Uint16 srcX, srcY, dstX, dstY;
//msg->readCoordinatePair(srcX, srcY, dstX, dstY);
- dstBeing->mX = srcX;
- dstBeing->mY = srcY;
- dstBeing->setDestination(dstX, dstY);
+ //dstBeing->mX = srcX;
+ //dstBeing->mY = srcY;
+ //dstBeing->setDestination(dstX, dstY);
}
else
{
diff --git a/src/net/maploginhandler.cpp b/src/net/maploginhandler.cpp
index 2a174c58..38ed2203 100644
--- a/src/net/maploginhandler.cpp
+++ b/src/net/maploginhandler.cpp
@@ -42,14 +42,14 @@ MapLoginHandler::MapLoginHandler()
void MapLoginHandler::handleMessage(MessageIn *msg)
{
- unsigned char direction;
+ //unsigned char direction;
switch (msg->getId())
{
case SMSG_LOGIN_SUCCESS:
msg->readLong(); // server tick
- logger->log("Protocol: Player start position: (%d, %d), Direction: %d",
- player_node->mX, player_node->mY, direction);
+ //logger->log("Protocol: Player start position: (%d, %d), Direction: %d",
+ // player_node->mX, player_node->mY, direction);
state = GAME_STATE;
break;
diff --git a/src/net/protocol.h b/src/net/protocol.h
index e1d403a2..6a13bbd9 100644
--- a/src/net/protocol.h
+++ b/src/net/protocol.h
@@ -191,7 +191,7 @@ enum {
ERRMSG_NO_LOGIN, // the user is not yet logged
ERRMSG_NO_CHARACTER_SELECTED, // the user needs a character
ERRMSG_INSUFFICIENT_RIGHTS, // the user is not privileged
- ERRMSG_INVALID_ARGUMENT, // part of the received message was invalid
+ ERRMSG_INVALID_ARGUMENT // part of the received message was invalid
};
// Login specific return values