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

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index be18be7..3808841 100644
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -24,6 +24,7 @@ namespace CarFire
 
         public Map Map;
         public List<IEntity> Entities = new List<IEntity>();
+        public List<Projectile> mProjectiles = new List<Projectile>();
         public Player[] mCharacters = new Player[4];
         public Display mDisplay;
 
@@ -259,7 +260,7 @@ namespace CarFire
             {
                 State.mCharacters[i].Coordinates = State.Map.GetStartingPositionForPlayer(i + 1);
             }
-            State.Entities = State.Map.GetAllEntities();
+            State.Entities = State.Map.GetAllEntities(this);
         }
         public void LoadContent(ContentManager contentManager)
         {
@@ -311,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");
 
             /*
@@ -380,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);