fixed bug where the 'push b to begin' message wasn't displaying for the host at the...

[chaz/carfire] / Project06 / CS 3505 Project 06 / CS 3505 Project 06 / LobbyGUI.cs

diff --git a/Project06/CS 3505 Project 06/CS 3505 Project 06/LobbyGUI.cs b/Project06/CS 3505 Project 06/CS 3505 Project 06/LobbyGUI.cs
index 08efb7c34df81445e0ac23e47d91f28ada4fdbc9..8f45156c015f8a770669d0a8ed35b5b0feecc83f 100644 (file)
--- a/Project06/CS 3505 Project 06/CS 3505 Project 06/LobbyGUI.cs
+++ b/Project06/CS 3505 Project 06/CS 3505 Project 06/LobbyGUI.cs
@@ -269,22 +269,27 @@ namespace CS_3505_Project_06
                         currentState = lobbyState.FindGame;\r
                     else if (availableSessions != null && availableSessions.Count > 0)\r
                     {\r
-                        if (currentKeyboardState.IsKeyDown(Keys.D1) && previousKeyboardState.IsKeyUp(Keys.D1))\r
+                        if (currentKeyboardState.IsKeyDown(Keys.D1) && previousKeyboardState.IsKeyUp(Keys.D1) && availableSessions.Count > 0)\r
                         {\r
                             networkGame.JoinSession(availableSessions[0], JoinedSession);\r
-                            currentState = lobbyState.JoiningGame;\r
-\r
-                            availableSessions.Dispose();\r
-                            availableSessions = null;\r
                         }\r
-                        if (currentKeyboardState.IsKeyDown(Keys.D2) && previousKeyboardState.IsKeyUp(Keys.D2))\r
+                        else if (currentKeyboardState.IsKeyDown(Keys.D2) && previousKeyboardState.IsKeyUp(Keys.D2) && availableSessions.Count > 1)\r
                         {\r
-                            networkGame.JoinSession(availableSessions[0], JoinedSession);\r
-                            currentState = lobbyState.JoiningGame;\r
-\r
-                            availableSessions.Dispose();\r
-                            availableSessions = null;\r
+                            networkGame.JoinSession(availableSessions[1], JoinedSession);\r
+                        }\r
+                        else if (currentKeyboardState.IsKeyDown(Keys.D3) && previousKeyboardState.IsKeyUp(Keys.D3) && availableSessions.Count > 2)\r
+                        {\r
+                            networkGame.JoinSession(availableSessions[2], JoinedSession);\r
                         }\r
+                        else if (currentKeyboardState.IsKeyDown(Keys.D4) && previousKeyboardState.IsKeyUp(Keys.D4) && availableSessions.Count > 3)\r
+                        {\r
+                            networkGame.JoinSession(availableSessions[3], JoinedSession);\r
+                        }\r
+\r
+                        currentState = lobbyState.JoiningGame;\r
+\r
+                        availableSessions.Dispose();\r
+                        availableSessions = null;\r
                     }\r
 \r
                     break;\r
@@ -365,7 +370,7 @@ namespace CS_3505_Project_06
                             }\r
 \r
                             //allows host to start the game when all players are ready, change count below to different number for testing with less then 4 players\r
-                            if (allReady && players.Count == 2 && localPlayer == players[0])\r
+                            if (allReady && players.Count == 4 && localPlayer == players[0])\r
                             {\r
                                 if (currentKeyboardState.IsKeyDown(Keys.B) && previousKeyboardState.IsKeyUp(Keys.B))\r
                                 {\r
@@ -441,7 +446,7 @@ namespace CS_3505_Project_06
                 case lobbyState.Connected:\r
                     DrawPlayerList(spriteBatch);\r
                     DrawChatInfo(spriteBatch);                    \r
-                    if(allReady && players.Count == 2 && localPlayer == players[0])\r
+                    if(allReady && players.Count == 4 && localPlayer == players[0])\r
                         spriteBatch.DrawString(menuFont, "Press B to begin game!", new Vector2(MaxX / 2, MaxY / 2), Color.White, 0f, zero, .7f, SpriteEffects.None, 0.5f);\r
                     else if(allReady)\r
                         spriteBatch.DrawString(menuFont, "The game will begin soon.", new Vector2(MaxX / 2, MaxY / 2), Color.White, 0f, zero, .7f, SpriteEffects.None, 0.5f);\r