X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FProjectile.cs;fp=CarFire%2FCarFire%2FCharacterTestBed%2FProjectile.cs;h=e9fd47b2cc95b06eb8b5cbc379a1728e48b1cda3;hb=65c7b1983e25cd16f2e00b83f23542854e8345af;hp=dfbc87b9e1afd438dba99c7766dc786eb9d2fa8b;hpb=2069ccccbb9dc0007f36555862615e684e93a8b2;p=chaz%2Fcarfire

diff --git a/CarFire/CarFire/CharacterTestBed/Projectile.cs b/CarFire/CarFire/CarFire/Projectile.cs
similarity index 92%
rename from CarFire/CarFire/CharacterTestBed/Projectile.cs
rename to CarFire/CarFire/CarFire/Projectile.cs
index dfbc87b..e9fd47b 100644
--- a/CarFire/CarFire/CharacterTestBed/Projectile.cs
+++ b/CarFire/CarFire/CarFire/Projectile.cs
@@ -55,14 +55,15 @@ namespace CarFire
         public void Update()
         {
             //See if something moved onto this projectile.
-            if(theMap.isOpenSquare(gridX, gridY))
+            if(theMap.IsCellOpen(gridX, gridY))
             {
-                theMap.damageSquare(gridX, gridY, damage);
+                //theMap.damageSquare(gridX, gridY, damage);
             }
             //If the projectile will be moving to a new grid position we need to check to see if it is occupied.
+            /*
             if ((int)((pixelX + velocity.X) / theMap.gridToPixelRatio) != gridX || (int)((pixelY + velocity.Y) / Map.gridToPixelRatio) != gridY)
             {
-                bool open = theMap.isOpenSquare((pixelX + velocity.X) / theMap.gridToPixelRatio, (pixelY + velocity.Y) / Map.gridToPixelRatio);
+                bool open = theMap.IsCellOpen((pixelX + velocity.X) / theMap.gridToPixelRatio, (pixelY + velocity.Y) / Map.gridToPixelRatio);
                 //If open just move this projectile there
                 //***Map doesn't need to know that this projectile is there because players/monsters are allowed
                 // to move into the path of projectiles.
@@ -80,6 +81,7 @@ namespace CarFire
                     //theMap.damageSquare(gridX, gridY, damage);
                 }
             }
+            */
             //If it is not moving grid positions just increment pixelX and pixelY
             else
             {