git-svn-id: https://bd85.net/svn/cs3505_group@168 92bb83a3-7c8f-8a45-bc97-515c4e399668

[chaz/carfire] / CarFire / CarFire / CarFire / ScreenManager.cs

diff --git a/CarFire/CarFire/CarFire/ScreenManager.cs b/CarFire/CarFire/CarFire/ScreenManager.cs
index 0c58e77cfd3bcdd75fc1f515623d8ffc4928c021..b7a30b5c39f8b689bd21ea00b72e3b22800930e8 100644 (file)
--- a/CarFire/CarFire/CarFire/ScreenManager.cs
+++ b/CarFire/CarFire/CarFire/ScreenManager.cs
@@ -12,7 +12,7 @@ using Microsoft.Xna.Framework.Content;
 \r
 namespace CarFire\r
 {\r
-    class ScreenManager : IScreenManager\r
+    public class ScreenManager : IScreenManager\r
     {\r
         #region local variables\r
         float scale;\r
@@ -348,7 +348,7 @@ namespace CarFire
                         }\r
                         if (currentKeyboardState.IsKeyDown(Keys.R) && previousKeyboardState.IsKeyUp(Keys.R))\r
                             networkManager.LocalGamer.IsReady = true;\r
-\r
+                        \r
                         if (networkManager.HasActiveSession)\r
                         {\r
                             localPlayer = networkManager.LocalGamer;\r
@@ -365,7 +365,7 @@ namespace CarFire
                             }\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 == 4 && 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 +441,7 @@ namespace CarFire
                 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