Merge remote branch '1.0/1.0'

Conflicts:
	data/graphics/CMakeLists.txt
	data/graphics/Makefile.am
	src/client.cpp

3 files changed, 11 insertions, 13 deletions

diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 843e5c9f..8f15691c 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -70,9 +70,6 @@ CharServerHandler::CharServerHandler()
 
 void CharServerHandler::handleMessage(Net::MessageIn &msg)
 {
-    logger->log("CharServerHandler: Packet ID: %x, Length: %d",
-                msg.getId(), msg.getLength());
-
     switch (msg.getId())
     {
             case SMSG_CHAR_LOGIN:
@@ -102,16 +99,17 @@ void CharServerHandler::handleMessage(Net::MessageIn &msg)
             switch (msg.readInt8())
             {
                 case 0:
-                    errorMessage = _("Access denied.");
+                    errorMessage = _("Access denied. Most likely, there are "
+                                     "too many players on this server.");
                     break;
                 case 1:
                     errorMessage = _("Cannot use this ID.");
                     break;
                 default:
-                    errorMessage = _("Unknown failure to select character.");
+                    errorMessage = _("Unknown char-server failure.");
                     break;
             }
-            unlockCharSelectDialog();
+            Client::setState(STATE_ERROR);
             break;
 
         case SMSG_CHAR_CREATE_SUCCEEDED:
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 7d973ba3..e58acb4d 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -42,6 +42,7 @@ namespace TmwAthena {
 extern ServerInfo charServer;
 
 LoginHandler::LoginHandler():
+        mVersionResponse(false),
         mRegistrationEnabled(true)
 {
     static const Uint16 _messages[] = {
@@ -187,6 +188,7 @@ void LoginHandler::handleMessage(Net::MessageIn &msg)
         case SMSG_SERVER_VERSION_RESPONSE:
             {
                 // TODO: verify these!
+
                 msg.readInt8(); // -1
                 msg.readInt8(); // T
                 msg.readInt8(); // M
@@ -194,13 +196,10 @@ void LoginHandler::handleMessage(Net::MessageIn &msg)
 
                 unsigned int options = msg.readInt32();
 
-                if (options & 1)
-                {
-                    // Registeration not allowed
-                    mRegistrationEnabled = false;
-                }
+                mRegistrationEnabled = (options & 1);
 
-                //state = STATE_LOGIN;
+                // Leave this last
+                mVersionResponse = true;
             }
             break;
     }
@@ -214,7 +213,7 @@ void LoginHandler::connect()
 
 bool LoginHandler::isConnected()
 {
-    return mNetwork->isConnected();
+    return mVersionResponse && mNetwork->isConnected();
 }
 
 void LoginHandler::disconnect()
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index 455c75f1..8f6ea321 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -83,6 +83,7 @@ class LoginHandler : public MessageHandler, public Net::LoginHandler
         void sendLoginRegister(const std::string &username,
                                const std::string &password);
 
+        bool mVersionResponse;
         bool mRegistrationEnabled;
         std::string mUpdateHost;
         Worlds mWorlds;