X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FHuman.cs;h=3897491da0305896fb6674f3f13f08f0261282f1;hb=f69be675ab1a1a9ab4b478f213c7b708d59820f2;hp=6c037947d9f50f6744b255039c338cb961073150;hpb=db8ff41d389a83c3fb8743139afa1dea99eef434;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CarFire/Human.cs b/CarFire/CarFire/CarFire/Human.cs
index 6c03794..3897491 100644
--- a/CarFire/CarFire/CarFire/Human.cs
+++ b/CarFire/CarFire/CarFire/Human.cs
@@ -24,23 +24,19 @@ namespace CarFire
 
         MovementManager mMotion;
         bool visible;
-        Display theDisplay;
 
         //Used to draw projectiles
         int projectileSpeed;
         int projectileCoolDown;
         
 
-        public Human(Game theGame, String Name, Texture2D model, Texture2D projectile, Display mDisplay, Point position)
+        public Human(Game theGame, String Name, Point position)
         {
             game = theGame;
             CharName = Name;
-            theDisplay = mDisplay;
             health = 100;
             score = 0;
             visible = false;
-            charModel = model;
-            projectileModel = projectile;
             projectileSpeed = 8;
 
             // Speed is the number of grid cells you can move through per second.
@@ -49,8 +45,8 @@ namespace CarFire
 
         public void LoadContent(ContentManager contentManager)
         {
-            charModel = contentManager.Load<Texture2D>("deselectBox"); //change to charModel when designed
-            projectileModel = contentManager.Load<Texture2D>("emptySelectBox"); //change to a projectile model later
+            charModel = contentManager.Load<Texture2D>("cs"); //change to charModel when designed
+            projectileModel = contentManager.Load<Texture2D>("projectile"); //change to a projectile model later
 
         }
 
@@ -145,7 +141,7 @@ namespace CarFire
                     toShoot.Normalize();
                     toShoot *= projectileSpeed;
                     projectileCoolDown = shootCoolDown;
-                    theDisplay.AddProjectiles(new Projectile(game.State.Map, projectileModel,
+                    game.State.mDisplay.AddProjectiles(new Projectile(game.State.Map, projectileModel,
                         toShoot, new Point(startX, startY)));