Index: client/Client/main.cpp
===================================================================
--- client/Client/main.cpp	(revision cb5a021b16956bebdf7631e74286e9fe349b2480)
+++ client/Client/main.cpp	(revision cf057294ce2ede368610b13485ab93d710bd774f)
@@ -882,5 +882,24 @@
       }
       case STATE_GAME_LOBBY:
+      {
          cout << "(STATE_GAME_LOBBY) ";
+         switch(msg.type)
+         {
+            case MSG_TYPE_START_GAME:
+            {
+               state = STATE_GAME;
+               wndCurrent = wndGame;
+
+               break;
+            }
+            default:
+            {
+               // keep these lines commented until until the correct messages are moved into the STATE_GAME_LOBBY section
+               //cout << "Received invalid message of type " << msg.type << endl;
+
+               //break;
+            }
+         }
+      }
       case STATE_GAME:
       {
@@ -1094,11 +1113,4 @@
                break;
             }
-            case MSG_TYPE_START_GAME:
-            {
-               state = STATE_GAME;
-               wndCurrent = wndGame;
-
-               break;
-            }
             default:
             {
@@ -1405,5 +1417,5 @@
 
 void startGame() {
-   msgTo.type = MSG_TYPE_LEAVE_GAME;
+   msgTo.type = MSG_TYPE_START_GAME;
 
    msgProcessor.sendMessage(&msgTo, &server);