Melee and Ranged now inheret from Player

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

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index c867b3c749e072a65d4fbe30a50913427e2b7191..dce6ba45cadb5309632d4ff847cc132a7a4126a9 100644 (file)
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -24,7 +24,7 @@ namespace CarFire
 \r
         public Map Map;\r
         public List<IEntity> Entities = new List<IEntity>();\r
-        public IPlayer[] mCharacters = new IPlayer[4];\r
+        public Player[] mCharacters = new Player[4];\r
         public Display mDisplay;\r
 \r
         #endregion\r
@@ -232,7 +232,6 @@ namespace CarFire
 \r
 \r
         #region Public Methods\r
-\r
         public bool IsCellOpen(Point point)\r
         {\r
             if (!State.Map.IsCellOpen(point)) return false;\r
@@ -250,6 +249,7 @@ namespace CarFire
         public void LoadContent(ContentManager contentManager)\r
         {\r
             mContentManager = contentManager;\r
+            menu = mContentManager.Load<SpriteFont>("menuFont");\r
             \r
         }\r
 \r
@@ -384,15 +384,21 @@ namespace CarFire
                     allCharactersSelected = false;\r
                     if (State.GetKeysDown(i).Contains(Keys.Enter))\r
                     {\r
-                        State.mCharacters[i] = new Human(this, "", State.Map.GetStartingPositionForPlayer(i + 1));\r
+                        State.mCharacters[i] = new Ranged(this, "", State.Map.GetStartingPositionForPlayer(i + 1), i);\r
                         State.mCharacters[i].LoadContent(mContentManager);\r
                     }\r
                 }\r
             }\r
             if (allCharactersSelected)\r
             {\r
+                \r
                 State.mDisplay.Draw(spriteBatch);\r
             }\r
+            else\r
+            {\r
+                spriteBatch.GraphicsDevice.Clear(Color.Black);\r
+                spriteBatch.DrawString(menu, "Press Enter To Select A Character", new Vector2(30, 30), Color.RosyBrown);\r
+            }\r
             return CurrentFrameNumber;\r
         }\r
 \r
@@ -401,7 +407,7 @@ namespace CarFire
 \r
         #region Private Variables\r
 \r
-        Display mDisplay;\r
+        SpriteFont menu;\r
 \r
         ContentManager mContentManager;\r
         NextInputs mInputs;\r