Verify the gender to prevent crashing when something is wrong with the communication.

2 files changed, 10 insertions, 7 deletions

diff --git a/src/net/loginhandler.cpp b/src/net/loginhandler.cpp
index ebc8f535..324c33cd 100644
--- a/src/net/loginhandler.cpp
+++ b/src/net/loginhandler.cpp
@@ -52,8 +52,7 @@ void LoginHandler::handleMessage(MessageIn *msg)
             // Successful login
             if (errMsg == ERRMSG_OK)
             {
-                unsigned char charNumber;
-                charNumber = msg->readByte();
+                unsigned char charNumber = msg->readByte();
                 printf("Account has %i characters:\n", charNumber);
                 for (unsigned int i = 0; i < charNumber; i++) {
                     // Create a temp empty player to show up in character
diff --git a/src/net/network.cpp b/src/net/network.cpp
index f18cf412..dcfbc8f1 100644
--- a/src/net/network.cpp
+++ b/src/net/network.cpp
@@ -146,12 +146,16 @@ void Network::dispatchMessages()
 
         MessageHandlerIterator iter = mMessageHandlers.find(msg.getId());
 
-        printf("Received packet: %x\n", msg.getId());
-
-        if (iter != mMessageHandlers.end())
+        if (iter != mMessageHandlers.end()) {
+            logger->log("Received packet %x (%i B)",
+                        msg.getId(), msg.getLength());
             iter->second->handleMessage(&msg);
-        else
-            logger->log("Unhandled packet: %x", msg.getId());
+        }
+        else {
+            logger->log("Unhandled packet %x (%i B)",
+                        msg.getId(), msg.getLength());
+        }
+
         mIncomingPackets.pop();
         // Clean up the packet now that we're done using it.
         enet_packet_destroy(packet);