X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FGame.cs;h=45b79d16901a653e8bcd1038075c8766d7fc4086;hp=fa3fbd1b9e7b6a5a4134b40f135cf1ddb1144d2a;hb=d167160264cd2c33de81a71039eddbb959c40bb2;hpb=af9deb873b24dadd0d509ce199fc6cac2b3efbc9

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index fa3fbd1..45b79d1 100644
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -24,6 +24,9 @@ namespace CarFire
 
         public Map Map;
         public List<IEntity> Entities = new List<IEntity>();
+        public List<Projectile> mProjectiles = new List<Projectile>();
+        public Player[] mCharacters;
+        public Display mDisplay;
 
         #endregion
 
@@ -39,6 +42,8 @@ namespace CarFire
             mNumberOfPlayers = numPlayers;
             mFrameNumber = 0;
 
+            mCharacters = new Player[numPlayers];
+
             mIsGameOver = new bool[numPlayers];
             mIsTerminated = new bool[numPlayers];
 
@@ -220,7 +225,7 @@ namespace CarFire
                 foreach (IEntity entity in State.Entities)
                 {
                     Point coordinates = entity.Coordinates;
-                    grid[coordinates.X, coordinates.Y] = true;
+                    if (State.Map.IsCellOpen(coordinates)) grid[coordinates.X, coordinates.Y] = false;
                 }
                 return grid;
             }
@@ -231,24 +236,55 @@ namespace CarFire
 
         #region Public Methods
 
-        public bool IsCellOpen(Point point)
+        public IEntity GetEntityAtCoordinates(Point point)
         {
-            if (!State.Map.IsCellOpen(point)) return false;
             foreach (IEntity entity in State.Entities)
             {
-                if (entity.Coordinates == point) return false;
+                if (entity.Coordinates == point) return entity;
+            }
+            return null;
+        }
+
+        public Player GetPlayerAtCoordinates(Point point)
+        {
+            foreach (Player player in State.mCharacters)
+            {
+                if (player != null && player.Coordinates == point) return player;
             }
+            return null;
+        }
+
+        public bool IsCellOpen(Point point)
+        {
+            if (!State.Map.IsCellOpen(point)) return false;
+            if (GetEntityAtCoordinates(point) != null) return false;
             return true;
         }
 
         public Game()
         {
-            mDisplay = new Display(this);
+           
+        }
+        /// <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)
         {
             mContentManager = contentManager;
-            mDisplay.LoadContent(contentManager);
+            menu = mContentManager.Load<SpriteFont>("menuFont");
+            
         }
 
         public void UnloadContent()
@@ -290,10 +326,11 @@ namespace CarFire
 
             State = new GameState(numPlayers);
             mInputs = new NextInputs(numPlayers);
+            State.mDisplay = new Display(this);
+            State.mDisplay.LoadContent(mContentManager);
 
-            State.Map = mContentManager.Load<Map>("Maps/stable");
-            State.Map.Game = this;
-            State.Entities = State.Map.GetAllEntities();
+            State.Map = mContentManager.Load<Map>("Maps/level1");
+            State.Entities = State.Map.GetAllEntities(this);
             Map.DefaultTile = mContentManager.Load<Texture2D>("default");
 
             /*
@@ -361,7 +398,7 @@ namespace CarFire
         public long Update(TimeSpan elapsedTime)
         {
             State.AdvanceFrame(mInputs, elapsedTime.Milliseconds);  // Apply the inputs, advance game state.
-            mDisplay.Update(elapsedTime, State);
+            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);
@@ -371,7 +408,35 @@ namespace CarFire
 
         public long Draw(SpriteBatch spriteBatch)
         {
-            mDisplay.Draw(spriteBatch);
+            bool allCharactersSelected = true;
+            for (int i = 0; i < State.NumberOfPlayers; i++)
+            {
+                //If player has not selected a player yet let them select one.
+                if (State.mCharacters[i] == null)
+                {
+                    allCharactersSelected = false;
+                    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);
+                    }
+                }
+            }
+            if (allCharactersSelected)
+            {
+                
+                State.mDisplay.Draw(spriteBatch);
+            }
+            else
+            {
+                spriteBatch.GraphicsDevice.Clear(Color.Black);
+                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;
         }
 
@@ -380,7 +445,7 @@ namespace CarFire
 
         #region Private Variables
 
-        Display mDisplay;
+        SpriteFont menu;
 
         ContentManager mContentManager;
         NextInputs mInputs;