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

diff --git a/CarFire/CarFire/CarFire/Game.cs b/CarFire/CarFire/CarFire/Game.cs
index 937cd4d..3808841 100644
--- a/CarFire/CarFire/CarFire/Game.cs
+++ b/CarFire/CarFire/CarFire/Game.cs
@@ -260,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)
         {
@@ -312,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");
 
             /*