X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=Project06%2FCS%203505%20Project%2006%2FCS%203505%20Project%2006%2FLobbyGUI.cs;h=74bc9a7d4305b8f06430f3c70a5469e87aa6eec8;hb=e4d9151151e2ef64c6b26cf2f4867734c6b53ee7;hp=08efb7c34df81445e0ac23e47d91f28ada4fdbc9;hpb=d77039298ad2420042b26799c0afdb916572f2b0;p=chaz%2Fcarfire

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 08efb7c..74bc9a7 100644
--- 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;
                     else if (availableSessions != null && availableSessions.Count > 0)
                     {
-                        if (currentKeyboardState.IsKeyDown(Keys.D1) && previousKeyboardState.IsKeyUp(Keys.D1))
+                        if (currentKeyboardState.IsKeyDown(Keys.D1) && previousKeyboardState.IsKeyUp(Keys.D1) && availableSessions.Count > 0)
                         {
                             networkGame.JoinSession(availableSessions[0], JoinedSession);
-                            currentState = lobbyState.JoiningGame;
-
-                            availableSessions.Dispose();
-                            availableSessions = null;
                         }
-                        if (currentKeyboardState.IsKeyDown(Keys.D2) && previousKeyboardState.IsKeyUp(Keys.D2))
+                        else if (currentKeyboardState.IsKeyDown(Keys.D2) && previousKeyboardState.IsKeyUp(Keys.D2) && availableSessions.Count > 1)
                         {
-                            networkGame.JoinSession(availableSessions[0], JoinedSession);
-                            currentState = lobbyState.JoiningGame;
-
-                            availableSessions.Dispose();
-                            availableSessions = null;
+                            networkGame.JoinSession(availableSessions[1], JoinedSession);
+                        }
+                        else if (currentKeyboardState.IsKeyDown(Keys.D3) && previousKeyboardState.IsKeyUp(Keys.D3) && availableSessions.Count > 2)
+                        {
+                            networkGame.JoinSession(availableSessions[2], JoinedSession);
                         }
+                        else if (currentKeyboardState.IsKeyDown(Keys.D4) && previousKeyboardState.IsKeyUp(Keys.D4) && availableSessions.Count > 3)
+                        {
+                            networkGame.JoinSession(availableSessions[3], JoinedSession);
+                        }
+
+                        currentState = lobbyState.JoiningGame;
+
+                        availableSessions.Dispose();
+                        availableSessions = null;
                     }
 
                     break;
@@ -365,7 +370,7 @@ namespace CS_3505_Project_06
                             }
 
                             //allows host to start the game when all players are ready, change count below to different number for testing with less then 4 players
-                            if (allReady && players.Count == 2 && localPlayer == players[0])
+                            if (allReady && players.Count == 4 && localPlayer == players[0])
                             {
                                 if (currentKeyboardState.IsKeyDown(Keys.B) && previousKeyboardState.IsKeyUp(Keys.B))
                                 {