Changes in client/Client/main.cpp [ec48e7d:171c4fe] in network-game

File:

• client/Client/main.cpp (modified) (6 diffs)

client/Client/main.cpp

@@ -51 +51 @@
 enum STATE {
    STATE_START,
-   STATE_LOGIN,
-   STATE_LOGOUT
+   STATE_LOGIN
 };
  
@@ -203 +202 @@
                switch(state)
                {
-                  case STATE_START:
+               case STATE_START:
+                  msgTo.type = MSG_TYPE_LOGIN;
+                  username = input;
+                  break;
+               case STATE_LOGIN:
+                  if (input.compare("quit") == 0 ||
+                      input.compare("exit") == 0 ||
+                      input.compare("logout") == 0)
                   {
-                     msgTo.type = MSG_TYPE_LOGIN;
-                     username = input;
-                     break;
+                     strcpy(msgTo.buffer, username.c_str());
+                     msgTo.type = MSG_TYPE_LOGOUT;
                   }
-                  case STATE_LOGIN:
-                  {
-                     if (input.compare("quit") == 0 ||
-                         input.compare("exit") == 0 ||
-                         input.compare("logout") == 0)
-                     {
-                        strcpy(msgTo.buffer, username.c_str());
-                        msgTo.type = MSG_TYPE_LOGOUT;
-                     }
-                     else
-                        msgTo.type = MSG_TYPE_CHAT;
-                     break;
-                  }
-                  case STATE_LOGOUT:
-                  {
-                     cout << "Bug: You're logged out, so you shouldn't be receiving any messages." << endl;
-                  
-                     break;
-                  }
-                  default:
-                  {
-                     cout << "The state has an invalid value: " << state << endl;
-                  
-                     break;
-                  }
+                  else
+                     msgTo.type = MSG_TYPE_CHAT;
+                  break;
+               default:
+                  cout << "The state has an invalid value: " << state << endl;
+                  break;
                }
 
@@ -243 +229 @@
                if (n < 0)
                   error("receiveMessage");
-
-               string response = string(msgFrom.buffer);
 
                switch(state)
@@ -250 +234 @@
                   case STATE_START:
                   {
+                     string loginResponse = string(msgFrom.buffer);
                      chatConsole.addLine(string(msgFrom.buffer));
 
-                     if (response.compare("Player has already logged in.") == 0)
+                     if (loginResponse.compare("Player has already logged in.") == 0)
                      {
                         cout << "User login failed" << endl;
@@ -267 +252 @@
                   {
                      chatConsole.addLine(string(msgFrom.buffer));
-
-                     if (response.compare("You have been successfully logged out. You may quit the game.") == 0)
-                     {
-                        state = STATE_LOGOUT;
-                     }
-                     else
-                     {
-                        cout << "Added new line" << endl;
-                     }
-                     
-                     break;
-                  }
-                  case STATE_LOGOUT:
-                  {
-                     cout << "Bug: You're logged out, so you shouldn't be receiving any messages." << endl;
-                  
+                     cout << "Added new line" << endl;
                      break;
                   }
@@ -288 +258 @@
                   {
                      cout << "The state has an invalid value: " << state << endl;
-
                      break;
                   }