From: brady <brady@92bb83a3-7c8f-8a45-bc97-515c4e399668>
Date: Thu, 18 Mar 2010 07:17:45 +0000 (+0000)
Subject: edited join game screen
X-Git-Url: https://git.dogcows.com/gitweb?a=commitdiff_plain;h=ccab068411b715c44a3e7a6ca165f0f4f05e417b;p=chaz%2Fcarfire

edited join game screen


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

diff --git a/Project06/lobbyTest/lobbyTest/Content/Content.contentproj b/Project06/lobbyTest/lobbyTest/Content/Content.contentproj
index 3c293d9..6305bbe 100644
--- a/Project06/lobbyTest/lobbyTest/Content/Content.contentproj
+++ b/Project06/lobbyTest/lobbyTest/Content/Content.contentproj
@@ -62,6 +62,13 @@
       <Processor>FontDescriptionProcessor</Processor>
     </Compile>
   </ItemGroup>
+  <ItemGroup>
+    <Compile Include="selectGameScreen.png">
+      <Name>selectGameScreen</Name>
+      <Importer>TextureImporter</Importer>
+      <Processor>TextureProcessor</Processor>
+    </Compile>
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath)\Microsoft\XNA Game Studio\v3.0\Microsoft.Xna.GameStudio.ContentPipeline.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Project06/lobbyTest/lobbyTest/Content/selectGameScreen.png b/Project06/lobbyTest/lobbyTest/Content/selectGameScreen.png
new file mode 100644
index 0000000..af04c0c
Binary files /dev/null and b/Project06/lobbyTest/lobbyTest/Content/selectGameScreen.png differ
diff --git a/Project06/lobbyTest/lobbyTest/LobbyGUI.cs b/Project06/lobbyTest/lobbyTest/LobbyGUI.cs
index b120567..046fa78 100644
--- a/Project06/lobbyTest/lobbyTest/LobbyGUI.cs
+++ b/Project06/lobbyTest/lobbyTest/LobbyGUI.cs
@@ -14,6 +14,7 @@ namespace lobbyTest
         Texture2D background;
         Texture2D spotLight;
         Texture2D cs;
+        Texture2D selectGameScreen;
 
         Vector2 backgroundPos;
         Vector2 spotLightPos;
@@ -35,6 +36,9 @@ namespace lobbyTest
         Vector2 findGamePos;
         string findGameText;
 
+        Vector2 returnToMainPos;
+        string returnToMainText;
+
         KeyboardState previousKeyboardState;
         KeyboardState currentKeyboardState;
 
@@ -58,6 +62,7 @@ namespace lobbyTest
             background = contentManager.Load<Texture2D>("background");
             spotLight = contentManager.Load<Texture2D>("spotlight");
             cs = contentManager.Load<Texture2D>("cs");
+            selectGameScreen = contentManager.Load<Texture2D>("selectGameScreen");
             backgroundPos = new Vector2(0f, 0f);
             spotLightPos = new Vector2(100f, graphics.GraphicsDevice.Viewport.Height - 98);
             spotLightCenter = new Vector2(800f, 800f);
@@ -79,6 +84,9 @@ namespace lobbyTest
 
             findGamePos = new Vector2(100f, (MaxY / 3) + 60);
             findGameText = "Find Game";
+
+            returnToMainPos = new Vector2(MaxX / 2, MaxY - 120);
+            returnToMainText = "press [ X ] to return to main menu";
         }
 
         public void UnloadContent()
@@ -98,14 +106,14 @@ namespace lobbyTest
                     {
                         if (currentKeyboardState.IsKeyDown(Keys.Enter) && previousKeyboardState.IsKeyUp(Keys.Enter))
                             currentState = lobbyState.CreateGame;
-                        if (currentKeyboardState.IsKeyDown(Keys.Down) || currentKeyboardState.IsKeyDown(Keys.Up))
+                        if (currentKeyboardState.IsKeyDown(Keys.Down))
                             selected = findGameText;
                     }
                     else
                     {
                         if (currentKeyboardState.IsKeyDown(Keys.Enter) && previousKeyboardState.IsKeyUp(Keys.Enter))
                             currentState = lobbyState.FindGame;
-                        if (currentKeyboardState.IsKeyDown(Keys.Down) || currentKeyboardState.IsKeyDown(Keys.Up))
+                        if (currentKeyboardState.IsKeyDown(Keys.Up))
                             selected = createGameText;
                     }
                     break;
@@ -113,6 +121,8 @@ namespace lobbyTest
 
                     break;
                 case lobbyState.FindGame:
+                    if (currentKeyboardState.IsKeyDown(Keys.X) && previousKeyboardState.IsKeyUp(Keys.X))
+                        currentState = lobbyState.Welcome;
 
                     break;
                 case lobbyState.Connected:
@@ -145,11 +155,15 @@ namespace lobbyTest
                     else
                         spriteBatch.DrawString(menuFont, findGameText, findGamePos, Color.Gray, 0, zero, 1f, SpriteEffects.None, 0.5f);
                     break;
+                
                 case lobbyState.CreateGame:
                     
                     break;
                 case lobbyState.FindGame:
-                    
+                    spriteBatch.Draw(selectGameScreen, backgroundPos, null, Color.White, 0, zero, 0.5f, SpriteEffects.None, 0);
+                    //spriteBatch.DrawString(menuFont, "Select Game", new Vector2(100, 100), Color.Gray, 0, zero, 1f, SpriteEffects.None, 0.5f);
+
+                    //spriteBatch.DrawString(menuFont, returnToMainText, returnToMainPos, Color.Gray, 0, new Vector2(180 , 0), .6f, SpriteEffects.None, 0.5f);
                     break;
                 case lobbyState.Connected: