Rearranged stuff to make scoring work.

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

diff --git a/CarFire/CarFire/CarFire/Projectile.cs b/CarFire/CarFire/CarFire/Projectile.cs
index 3f5b1368466a9496318ae47a3b63a86d315ff388..6603272c2f84ea9655d965c35ff8e5be1437cee3 100644 (file)
--- a/CarFire/CarFire/CarFire/Projectile.cs
+++ b/CarFire/CarFire/CarFire/Projectile.cs
@@ -15,7 +15,6 @@ namespace CarFire
     public class Projectile\r
     {\r
         //Member Variables\r
-        Map theMap;\r
         Vector2 velocity;\r
         Texture2D projectileModel;\r
         int damage;\r
@@ -27,6 +26,8 @@ namespace CarFire
         int pixelY;\r
         MovementManager mMotion;\r
         Point mPosition;\r
+        int mCharacterIndex;\r
+        Game mGame;\r
 \r
         /// <summary>\r
         /// The Constructor for a projectile object.\r
@@ -38,13 +39,15 @@ namespace CarFire
         /// <param name="_gridY">The starting Y position in the map grid</param>\r
         /// <param name="_pixelX">The absolute X pixel position on the map</param>\r
         /// <param name="_pixelY"> The absolute Y pixel position on the map</param>\r
-        public Projectile(Map _currentMap,\r
+        public Projectile(Game theGame,\r
                             Texture2D _projectileModel,\r
                             Vector2 _velocity,\r
-                            Point _position)\r
+                            Point _position,\r
+                            int characterNumber)\r
                 \r
         {\r
-            theMap = _currentMap;\r
+            mGame = theGame;\r
+            mCharacterIndex = characterNumber;\r
             projectileModel = _projectileModel;\r
             velocity = _velocity;\r
             mPosition = _position;\r
@@ -79,7 +82,7 @@ namespace CarFire
         /// <param name="topLeftY">The map Y pixel position of the topLeft of the display</param>\r
         public void Draw(SpriteBatch spriteBatch)\r
         {\r
-            Rectangle position = theMap.GetRectangleFromCoordinates(mMotion.Position);\r
+            Rectangle position = mGame.State.Map.GetRectangleFromCoordinates(mMotion.Position);\r
             spriteBatch.Draw(projectileModel, position, Color.White);\r
          \r
         }\r
@@ -91,7 +94,6 @@ namespace CarFire
         public int GridY { get { return gridY; } set { gridY = value; } }\r
         public int PixelX { get { return pixelX; } set { pixelX = value; } }\r
         public int PixelY { get { return pixelY; } set { pixelY = value; } }\r
-        public Map TheMap { get { return theMap; } set { theMap = value; } }\r
         public int Damage { get { return damage; } set { damage = value; } }\r
         public Vector2 Position { get { return mMotion.Position; } }\r
         public Point Coordinates { get { return mMotion.Coordinates; } }\r