diff options
author | Andrei Karas <akaras@inbox.ru> | 2012-10-10 01:40:58 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2012-10-10 01:40:58 +0300 |
commit | dd996d01676d7dca3eec442b14c4966ba0bb0935 (patch) | |
tree | cf33c3b0ab342ad7eace2c79d75fa5ba3e852f5e /src/net/tmwa/network.cpp | |
parent | 75d9cadaf376cad8f7244ee4d4632e94c0ef3bc0 (diff) | |
download | manaplus-dd996d01676d7dca3eec442b14c4966ba0bb0935.tar.gz manaplus-dd996d01676d7dca3eec442b14c4966ba0bb0935.tar.bz2 manaplus-dd996d01676d7dca3eec442b14c4966ba0bb0935.tar.xz manaplus-dd996d01676d7dca3eec442b14c4966ba0bb0935.zip |
Delete copy constructor from net classes.
Diffstat (limited to 'src/net/tmwa/network.cpp')
-rw-r--r-- | src/net/tmwa/network.cpp | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp index 15200fa50..278f8e2fd 100644 --- a/src/net/tmwa/network.cpp +++ b/src/net/tmwa/network.cpp @@ -137,24 +137,26 @@ void Network::dispatchMessages() { while (messageReady()) { - MessageIn msg = getNextMessage(); + MessageIn *const msg = getNextMessage(); - const MessageHandlerIterator iter = mMessageHandlers.find(msg.getId()); + const MessageHandlerIterator iter = mMessageHandlers.find( + msg->getId()); - if (msg.getLength() == 0) + if (msg->getLength() == 0) logger->safeError("Zero length packet received. Exiting."); if (iter != mMessageHandlers.end()) { if (iter->second) - iter->second->handleMessage(msg); + iter->second->handleMessage(*msg); } else { - logger->log("Unhandled packet: %x", msg.getId()); + logger->log("Unhandled packet: %x", msg->getId()); } - skip(msg.getLength()); + skip(msg->getLength()); + delete msg; } } @@ -193,7 +195,7 @@ bool Network::messageReady() return ret; } -MessageIn Network::getNextMessage() +MessageIn *Network::getNextMessage() { while (!messageReady()) { @@ -219,7 +221,7 @@ MessageIn Network::getNextMessage() // msgId, len)); #endif - MessageIn msg(mInBuffer, len); + MessageIn *msg = new MessageIn(mInBuffer, len); SDL_mutexV(mMutex); return msg; |