Modified Projectiles to work with MovementManager.

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

diff --git a/CarFire/CarFire/CarFire/Projectile.cs b/CarFire/CarFire/CarFire/Projectile.cs
index 308e313d39dbbfae5fa5467d84f30f34b3d7bf54..3f5b1368466a9496318ae47a3b63a86d315ff388 100644 (file)
--- a/CarFire/CarFire/CarFire/Projectile.cs
+++ b/CarFire/CarFire/CarFire/Projectile.cs
@@ -25,7 +25,9 @@ namespace CarFire
         //these will have to be transformed to the coordinate system that the drawable screen is using.\r
         int pixelX;\r
         int pixelY;\r
-   \r
+        MovementManager mMotion;\r
+        Point mPosition;\r
+\r
         /// <summary>\r
         /// The Constructor for a projectile object.\r
         /// </summary>\r
@@ -39,58 +41,34 @@ namespace CarFire
         public Projectile(Map _currentMap,\r
                             Texture2D _projectileModel,\r
                             Vector2 _velocity,\r
-                            int _gridX,\r
-                            int _gridY)\r
-                            /*,\r
-                            int _pixelX,\r
-                            int _pixelY)*/\r
+                            Point _position)\r
+                \r
         {\r
             theMap = _currentMap;\r
             projectileModel = _projectileModel;\r
             velocity = _velocity;\r
-            gridX = _gridX;\r
-            gridY = _gridY;\r
-            pixelX = _gridX * (int)Map.PixelsToUnitSquares;\r
-            pixelY = _gridY * (int)Map.PixelsToUnitSquares;\r
+            mPosition = _position;\r
             damage = 20;\r
+            // Speed is the number of grid cells you can move through per second.\r
+            mMotion = new MovementManager(mPosition, velocity.Length());\r
         }\r
-        public void Update(TimeSpan timespan)\r
+        public void Update(TimeSpan timeSpan)\r
         {\r
-            /*\r
-            //See if something moved onto this projectile.\r
-            if(theMap.isOpenSquare(gridX, gridY))\r
-            {\r
-                theMap.damageSquare(gridX, gridY, damage);\r
-            }\r
-             */\r
-            //If the projectile will be moving to a new grid position we need to check to see if it is occupied.\r
-            if ((int)((pixelX + velocity.X) / Map.PixelsToUnitSquares) != gridX || (int)((pixelY + velocity.Y) / Map.PixelsToUnitSquares) != gridY)\r
-            {\r
-                //bool open = theMap.IsCellOpen((int)((pixelX + velocity.X) /Map.PixelsToUnitSquares), (int)((pixelY + velocity.Y) / Map.PixelsToUnitSquares));\r
-                //If open just move this projectile there\r
-                //***Map doesn't need to know that this projectile is there because players/monsters are allowed\r
-                // to move into the path of projectiles.\r
-                //if (open)\r
-                {\r
-                //Console.WriteLine("pixelX:" + pixelX + " " + " pixelY: "+ pixelY);\r
-                    pixelX += (int)velocity.X;\r
-                    pixelY += (int)velocity.Y;\r
-                    gridX = (int)(pixelX /Map.PixelsToUnitSquares);\r
-                    gridY = (int)(pixelY / Map.PixelsToUnitSquares);\r
-                }\r
-                //If the square isn't open then just damage whatever is there\r
-                //TODO: A projectile must be deleted after this happens\r
-                //else\r
-                {\r
-                    //theMap.damageSquare(gridX, gridY, damage);\r
-                }\r
-            }\r
-            //If it is not moving grid positions just increment pixelX and pixelY\r
-            else\r
-            {\r
-                pixelX += (int)velocity.X;\r
-                pixelY += (int)velocity.Y;\r
-            }\r
+            bool moveRight = false;\r
+            bool moveLeft = false;\r
+            bool moveUp = false;\r
+            bool moveDown = false;\r
+            if (velocity.X > 0)\r
+                moveRight = true;\r
+            else if (velocity.X < 0)\r
+                moveLeft = true;\r
+            if (velocity.Y > 0)\r
+                moveDown = true;\r
+            else if (velocity.Y < 0)\r
+                moveUp = true;\r
+            Point destination = MovementManager.GetNeighborCell(mMotion.Coordinates, moveLeft, moveRight, moveUp, moveDown);\r
+            mMotion.Update(timeSpan, moveLeft, moveRight, moveUp, moveDown);\r
+            \r
             \r
         }\r
         /// <summary>\r
@@ -101,13 +79,9 @@ 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
-            //Console.WriteLine(gridX + " " + gridY);\r
-            //Console.WriteLine(theMap.GetRectangleFromCoordinates(new Vector2(gridX, gridY)));\r
-            Rectangle position = theMap.GetRectangleFromCoordinates(new Vector2(gridX, gridY));\r
-            //spriteBatch.Draw(projectileModel, position, Color.White);\r
-            Rectangle position2 = new Rectangle((int)(pixelX), (int)(pixelY), (int)Map.PixelsToUnitSquares, (int)Map.PixelsToUnitSquares);\r
-            Rectangle position3 = theMap.GetRectangleFromCoordinates(new Vector2(pixelX / Map.PixelsToUnitSquares, pixelY / Map.PixelsToUnitSquares));\r
-            spriteBatch.Draw(projectileModel, position3, Color.White);\r
+            Rectangle position = theMap.GetRectangleFromCoordinates(mMotion.Position);\r
+            spriteBatch.Draw(projectileModel, position, Color.White);\r
+         \r
         }\r
 \r
         /// <summary>\r
@@ -119,5 +93,7 @@ namespace CarFire
         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
     }\r
 }\r