X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FGame.cs;h=38088419c59db8bebb2c20f097cbe56102e11f4c;hb=beb1ce501897ce4c00f7e97c6923ba0af2451732;hp=3fd5ef0511e11af41721d50d0ffbdb031715bae8;hpb=f31fe51445e412355ef197ea87da3b07f7fc1c70;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index 3fd5ef0..3808841 100644
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -24,7 +24,8 @@ namespace CarFire
 
         public Map Map;
         public List<IEntity> Entities = new List<IEntity>();
-        public IPlayer[] mCharacters = new IPlayer[4];
+        public List<Projectile> mProjectiles = new List<Projectile>();
+        public Player[] mCharacters = new Player[4];
         public Display mDisplay;
 
         #endregion
@@ -245,6 +246,21 @@ namespace CarFire
         public Game()
         {
            
+        }
+        /// <summary>
+        /// This method should be called whenever the players want to move to a new map.
+        /// Not implemented yet.  Need some way to get next map.
+        /// </summary>
+        public void startNewMap()
+        {
+            //TODO somehow get next map
+            State.Entities.Clear();
+            //State.Map = State.Map.getNextMap();
+            for (int i = 0; i < State.mCharacters.Length; i++)
+            {
+                State.mCharacters[i].Coordinates = State.Map.GetStartingPositionForPlayer(i + 1);
+            }
+            State.Entities = State.Map.GetAllEntities(this);
         }
         public void LoadContent(ContentManager contentManager)
         {
@@ -296,8 +312,7 @@ namespace CarFire
             State.mDisplay.LoadContent(mContentManager);
 
             State.Map = mContentManager.Load<Map>("Maps/stable");
-            State.Map.Game = this;
-            State.Entities = State.Map.GetAllEntities();
+            State.Entities = State.Map.GetAllEntities(this);
             Map.DefaultTile = mContentManager.Load<Texture2D>("default");
 
             /*
@@ -365,7 +380,7 @@ namespace CarFire
         public long Update(TimeSpan elapsedTime)
         {
             State.AdvanceFrame(mInputs, elapsedTime.Milliseconds);  // Apply the inputs, advance game state.
-            State.mDisplay.Update(elapsedTime, State, mThisPlayerID);
+            State.mDisplay.Update(elapsedTime, mThisPlayerID);
             State.Entities.ForEach(delegate(IEntity e) { e.Update(elapsedTime); });
             mInputs = new NextInputs(State.NumberOfPlayers);  // Start with inputs cleared on the next frame.
             //mDisplay.Update(elapsedTime);
@@ -382,7 +397,12 @@ namespace CarFire
                 if (State.mCharacters[i] == null)
                 {
                     allCharactersSelected = false;
-                    if (State.GetKeysDown(i).Contains(Keys.Enter))
+                    if (State.GetKeysDown(i).Contains(Keys.M))
+                    {
+                        State.mCharacters[i] = new Melee(this, "", State.Map.GetStartingPositionForPlayer(i + 1), i);
+                        State.mCharacters[i].LoadContent(mContentManager);
+                    }
+                    else if (State.GetKeysDown(i).Contains(Keys.R))
                     {
                         State.mCharacters[i] = new Ranged(this, "", State.Map.GetStartingPositionForPlayer(i + 1), i);
                         State.mCharacters[i].LoadContent(mContentManager);
@@ -397,7 +417,7 @@ namespace CarFire
             else
             {
                 spriteBatch.GraphicsDevice.Clear(Color.Black);
-                spriteBatch.DrawString(menu, "Press Enter To Select A Character", new Vector2(30, 30), Color.RosyBrown);
+                spriteBatch.DrawString(menu, "Press R to select a Ranged Character and M to select a Melee Character", new Vector2(30, 30), Color.RosyBrown);
             }
             return CurrentFrameNumber;
         }