Character selection is now done in the Game Class instead of the display class.

[chaz/carfire] / CarFire / CarFire / CarFire / Human.cs

diff --git a/CarFire/CarFire/CarFire/Human.cs b/CarFire/CarFire/CarFire/Human.cs
index 6c037947d9f50f6744b255039c338cb961073150..5b4c6a01777597625c460f10f6d7aa629c2d447a 100644 (file)
--- a/CarFire/CarFire/CarFire/Human.cs
+++ b/CarFire/CarFire/CarFire/Human.cs
@@ -24,23 +24,19 @@ namespace CarFire
 \r
         MovementManager mMotion;\r
         bool visible;\r
-        Display theDisplay;\r
 \r
         //Used to draw projectiles\r
         int projectileSpeed;\r
         int projectileCoolDown;\r
         \r
 \r
-        public Human(Game theGame, String Name, Texture2D model, Texture2D projectile, Display mDisplay, Point position)\r
+        public Human(Game theGame, String Name, Point position)\r
         {\r
             game = theGame;\r
             CharName = Name;\r
-            theDisplay = mDisplay;\r
             health = 100;\r
             score = 0;\r
             visible = false;\r
-            charModel = model;\r
-            projectileModel = projectile;\r
             projectileSpeed = 8;\r
 \r
             // Speed is the number of grid cells you can move through per second.\r
@@ -145,7 +141,7 @@ namespace CarFire
                     toShoot.Normalize();\r
                     toShoot *= projectileSpeed;\r
                     projectileCoolDown = shootCoolDown;\r
-                    theDisplay.AddProjectiles(new Projectile(game.State.Map, projectileModel,\r
+                    game.State.mDisplay.AddProjectiles(new Projectile(game.State.Map, projectileModel,\r
                         toShoot, new Point(startX, startY)));\r
 \r
              \r