Fix warning about jump to case label crossing an initialization.

4 files changed, 82 insertions, 57 deletions

diff --git a/ChangeLog b/ChangeLog
index 3d6a947f..cfa79aa5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2006-08-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
+
+	* src/net/charserverhandler.h, src/net/charserverhandler.cpp: Fix
+	warning about jump to case label crossing an initialization.
+	* src/gui/vbox.cpp: Use std::list#empty since it is more efficient as
+	pointed out by doener.
+
 2006-08-14  Eugenio Favalli  <elvenprogrammer@gmail.com>
 
 	* src/being.cpp, src/being.h, src/gui/char_select.cpp,
@@ -8,7 +15,7 @@
 	src/net/loginhandler.h, src/net/messageout.cpp, src/net/messageout.h,
 	src/net/network.cpp, src/net/network.h, src/net/playerhandler.cpp,
 	src/net/protocol.h: Completed porting of character creation/deletion,
-	fixed some issues with network code.	
+	fixed some issues with network code.
 
 2006-08-14  Bjørn Lindeijer  <bjorn@lindeijer.nl>
 
diff --git a/src/gui/vbox.cpp b/src/gui/vbox.cpp
index eb838ead..b503508e 100644
--- a/src/gui/vbox.cpp
+++ b/src/gui/vbox.cpp
@@ -25,7 +25,7 @@
 
 void VBox::draw(gcn::Graphics *graphics)
 {
-    if (mWidgets.size() == 0)
+    if (mWidgets.empty())
     {
         return;
     }
diff --git a/src/net/charserverhandler.cpp b/src/net/charserverhandler.cpp
index e41ca0f3..b4715315 100644
--- a/src/net/charserverhandler.cpp
+++ b/src/net/charserverhandler.cpp
@@ -46,7 +46,8 @@ CharServerHandler::CharServerHandler()
     handledMessages = _messages;
 }
 
-void CharServerHandler::handleMessage(MessageIn *msg)
+void
+CharServerHandler::handleMessage(MessageIn *msg)
 {
     int slot;
     LocalPlayer *tempPlayer;
@@ -54,56 +55,7 @@ void CharServerHandler::handleMessage(MessageIn *msg)
     switch (msg->getId())
     {
         case APMSG_CHAR_CREATE_RESPONSE:
-            int errMsg = msg->readByte();
-            // Character creation successful
-            if (errMsg == ERRMSG_OK)
-            {
-            }
-            // Character creation failed
-            else
-            {
-                std::string message = "";
-                switch (errMsg)
-                {
-                    case ERRMSG_NO_LOGIN:
-                        message = "Not logged in";
-                        break;
-                    case CREATE_TOO_MUCH_CHARACTERS:
-                        message = "No empty slot";
-                        break;
-                    case ERRMSG_INVALID_ARGUMENT:
-                        message = "Invalid name";
-                        break;
-                    case CREATE_EXISTS_NAME:
-                        message = "Character's name already exists";
-                        break;
-                    case CREATE_INVALID_HAIRSTYLE:
-                        message = "Invalid hairstyle";
-                        break;
-                    case CREATE_INVALID_HAIRCOLOR:
-                        message = "Invalid hair color";
-                        break;
-                    case CREATE_INVALID_GENDER:
-                        message = "Invalid gender";
-                        break;
-                    case CREATE_RAW_STATS_TOO_HIGH:
-                        message = "Character's stats are too high";
-                        break;
-                    case CREATE_RAW_STATS_TOO_LOW:
-                        message = "Character's stats are too low";
-                        break;
-                    case CREATE_RAW_STATS_INVALID_DIFF:
-                        message = "Character's stats difference is too high";
-                        break;
-                    case CREATE_RAW_STATS_EQUAL_TO_ZERO:
-                        message = "One stat is zero";
-                        break;
-                    default:
-                        message = "Unknown error";
-                        break;
-                }
-                new OkDialog("Error", message);
-            }
+            handleCharCreateResponse(*msg);
             break;
         case APMSG_CHAR_DELETE_RESPONSE:
         {
@@ -147,7 +99,64 @@ void CharServerHandler::handleMessage(MessageIn *msg)
     }
 }
 
-LocalPlayer* CharServerHandler::readPlayerData(MessageIn *msg, int &slot)
+void
+CharServerHandler::handleCharCreateResponse(MessageIn &msg)
+{
+    int errMsg = msg.readByte();
+
+    // Character creation successful
+    if (errMsg == ERRMSG_OK)
+    {
+    }
+    // Character creation failed
+    else
+    {
+        std::string message = "";
+        switch (errMsg)
+        {
+            case ERRMSG_NO_LOGIN:
+                message = "Not logged in";
+                break;
+            case CREATE_TOO_MUCH_CHARACTERS:
+                message = "No empty slot";
+                break;
+            case ERRMSG_INVALID_ARGUMENT:
+                message = "Invalid name";
+                break;
+            case CREATE_EXISTS_NAME:
+                message = "Character's name already exists";
+                break;
+            case CREATE_INVALID_HAIRSTYLE:
+                message = "Invalid hairstyle";
+                break;
+            case CREATE_INVALID_HAIRCOLOR:
+                message = "Invalid hair color";
+                break;
+            case CREATE_INVALID_GENDER:
+                message = "Invalid gender";
+                break;
+            case CREATE_RAW_STATS_TOO_HIGH:
+                message = "Character's stats are too high";
+                break;
+            case CREATE_RAW_STATS_TOO_LOW:
+                message = "Character's stats are too low";
+                break;
+            case CREATE_RAW_STATS_INVALID_DIFF:
+                message = "Character's stats difference is too high";
+                break;
+            case CREATE_RAW_STATS_EQUAL_TO_ZERO:
+                message = "One stat is zero";
+                break;
+            default:
+                message = "Unknown error";
+                break;
+        }
+        new OkDialog("Error", message);
+    }
+}
+
+LocalPlayer*
+CharServerHandler::readPlayerData(MessageIn *msg, int &slot)
 {
     LocalPlayer *tempPlayer = new LocalPlayer(mLoginData->account_ID, 0, NULL);
     slot = msg->readByte(); // character slot
diff --git a/src/net/charserverhandler.h b/src/net/charserverhandler.h
index 16d2c361..ec5df3f8 100644
--- a/src/net/charserverhandler.h
+++ b/src/net/charserverhandler.h
@@ -36,13 +36,22 @@ class CharServerHandler : public MessageHandler
     public:
         CharServerHandler();
 
-        void handleMessage(MessageIn *msg);
+        void
+        handleMessage(MessageIn *msg);
 
-        void setCharInfo(LockedArray<LocalPlayer*> *charInfo) { mCharInfo = charInfo; };
+        void
+        setCharInfo(LockedArray<LocalPlayer*> *charInfo)
+        {
+            mCharInfo = charInfo;
+        }
 
-        void setLoginData(LoginData *loginData) { mLoginData = loginData; };
+        void
+        setLoginData(LoginData *loginData) { mLoginData = loginData; };
 
     protected:
+        void
+        handleCharCreateResponse(MessageIn &msg);
+
         LoginData *mLoginData;
         LockedArray<LocalPlayer*> *mCharInfo;