diff options
| author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-07-25 19:21:22 +0000 |
|---|---|---|
| committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2006-07-25 19:21:22 +0000 |
| commit | 33e19fb0822308a630ca6e1122b9b97882a120a7 (patch) | |
| tree | 78f80d6673bd5e52431d2fad986c0f1416dfd780 /src/net | |
| parent | c7e7b62aa94bf295ca1dc556762ad6070221e0cd (diff) | |
| download | mana-client-33e19fb0822308a630ca6e1122b9b97882a120a7.tar.gz mana-client-33e19fb0822308a630ca6e1122b9b97882a120a7.tar.bz2 mana-client-33e19fb0822308a630ca6e1122b9b97882a120a7.tar.xz mana-client-33e19fb0822308a630ca6e1122b9b97882a120a7.zip | |
Fixed Linux compiling issues and merged update system fix for Windows.
Diffstat (limited to 'src/net')
| -rw-r--r-- | src/net/beinghandler.cpp | 2 | ||||
| -rw-r--r-- | src/net/network.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/net/beinghandler.cpp b/src/net/beinghandler.cpp index 68a46650..7730e9be 100644 --- a/src/net/beinghandler.cpp +++ b/src/net/beinghandler.cpp @@ -368,7 +368,7 @@ void BeingHandler::handleMessage(MessageIn *msg) case 0x0119: // Change in players look - printf("0x0119 %i %i %i %x %i\n", msg->readLong(), + printf("0x0119 %li %i %i %x %i\n", msg->readLong(), msg->readShort(), msg->readShort(), msg->readShort(), msg->readByte()); break; diff --git a/src/net/network.cpp b/src/net/network.cpp index 8278e266..aa18e888 100644 --- a/src/net/network.cpp +++ b/src/net/network.cpp @@ -40,13 +40,13 @@ Network::~Network() { clearHandlers(); - if (mState != IDLE && mState != ERROR) + if (mState != IDLE && mState != NET_ERROR) disconnect(); } bool Network::connect(const std::string &address, short port) { - if (mState != IDLE && mState != ERROR) + if (mState != IDLE && mState != NET_ERROR) { logger->log("Tried to connect an already connected socket!"); return false; @@ -55,7 +55,7 @@ bool Network::connect(const std::string &address, short port) if (address.empty()) { logger->log("Empty address given to Network::connect()!"); - mState = ERROR; + mState = NET_ERROR; return false; } @@ -84,7 +84,7 @@ bool Network::connect(const std::string &address, short port) if (mServer == 0) { logger->log("Unable to initiate connection to the server."); - mState = ERROR; + mState = NET_ERROR; return false; } |