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

diff --git a/CarFire/CarFire/CharacterTestBed/Character.cs b/CarFire/CarFire/CarFire/Character.cs
similarity index 86%
rename from CarFire/CarFire/CharacterTestBed/Character.cs
rename to CarFire/CarFire/CarFire/Character.cs
index 863797f..e2c8aed 100644
--- a/CarFire/CarFire/CharacterTestBed/Character.cs
+++ b/CarFire/CarFire/CarFire/Character.cs
@@ -104,7 +104,7 @@ namespace CarFire
 
 
         }
-
+        /*
         /// <summary>
         /// Updates the players position in the current window, the player is kept centered
         /// in the window when possible. When the edge of the map is reached by one or more
@@ -115,6 +115,7 @@ namespace CarFire
         /// <param name="ScreenHeight">Used to know how tall the current window is</param>
         public void updatePlayerScreenPosition(int ScreenWidth, int ScreenHeight)
         {
+
             // if left edge of map has been reached by screen
             if (GridX * TheMap.GridToPixelRatio < ScreenWidth / 2)
             {
@@ -147,7 +148,7 @@ namespace CarFire
                 PixelY = ScreenHeight / 2;
             }
         }
-
+        */
         /// <summary>
         /// Moves the current player being controlled based on a given set of key presses.
         /// The player can only move one Grid space per movePlayer call. Thus this method
@@ -159,46 +160,46 @@ namespace CarFire
         {
             // move upleft
             keysPressed.Contains<Keys>(Keys.Left);
-            if (keysPressed.Contains<Keys>(Keys.Up) && keysPressed.Contains<Keys>(Keys.Left) && TheMap.isOpenSquare(GridX - 1, GridY - 1))
+            if (keysPressed.Contains<Keys>(Keys.Up) && keysPressed.Contains<Keys>(Keys.Left) && TheMap.IsCellOpen(GridX - 1, GridY - 1))
             {
                 GridX -= 1;
                 GridY -= 1;
             }
             // move upright
-            else if (keysPressed.Contains<Keys>(Keys.Up) && keysPressed.Contains<Keys>(Keys.Right) && TheMap.isOpenSquare(GridX + 1, GridY - 1))
+            else if (keysPressed.Contains<Keys>(Keys.Up) && keysPressed.Contains<Keys>(Keys.Right) && TheMap.IsCellOpen(GridX + 1, GridY - 1))
             {
                 GridX += 1;
                 GridY -= 1;
             }
             // move downleft
-            else if (keysPressed.Contains<Keys>(Keys.Down) && keysPressed.Contains<Keys>(Keys.Left) && TheMap.isOpenSquare(GridX - 1, GridY + 1))
+            else if (keysPressed.Contains<Keys>(Keys.Down) && keysPressed.Contains<Keys>(Keys.Left) && TheMap.IsCellOpen(GridX - 1, GridY + 1))
             {
                 GridX -= 1;
                 GridY += 1;
             }
             // move downright
-            else if (keysPressed.Contains<Keys>(Keys.Down) && keysPressed.Contains<Keys>(Keys.Right) && TheMap.isOpenSquare(GridX + 1, GridY + 1))
+            else if (keysPressed.Contains<Keys>(Keys.Down) && keysPressed.Contains<Keys>(Keys.Right) && TheMap.IsCellOpen(GridX + 1, GridY + 1))
             {
                 GridX += 1;
                 GridY += 1;
             }
             // move up
-            else if (keysPressed.Contains<Keys>(Keys.Up) && TheMap.isOpenSquare(GridX, GridY - 1))
+            else if (keysPressed.Contains<Keys>(Keys.Up) && TheMap.IsCellOpen(GridX, GridY - 1))
             {
                 GridY -= 1;
             }
             // move down
-            else if (keysPressed.Contains<Keys>(Keys.Down) && TheMap.isOpenSquare(GridX, GridY + 1))
+            else if (keysPressed.Contains<Keys>(Keys.Down) && TheMap.IsCellOpen(GridX, GridY + 1))
             {
                 GridY += 1;
             }
             // move left
-            else if (keysPressed.Contains<Keys>(Keys.Left) && TheMap.isOpenSquare(GridX - 1, GridY))
+            else if (keysPressed.Contains<Keys>(Keys.Left) && TheMap.IsCellOpen(GridX - 1, GridY))
             {
                 GridX -= 1;
             }
             // move right
-            else if (keysPressed.Contains<Keys>(Keys.Right) && TheMap.isOpenSquare(GridX + 1, GridY))
+            else if (keysPressed.Contains<Keys>(Keys.Right) && TheMap.IsCellOpen(GridX + 1, GridY))
             {
                 GridX += 1;
             }
@@ -227,37 +228,4 @@ namespace CarFire
 
         }
     }
-    /*
-    //this is for testing purposes only!
-    public class Map
-    {
-        int gridToPixelRatio;
-
-        public Map()
-        {
-            gridToPixelRatio = 10;
-        }
-
-        public int MaxGridX
-        {
-            get { return 100; }
-        }
-        public int MaxGridY
-        {
-            get { return 100; }
-        }
-
-        public int GridToPixelRatio
-        {
-            get { return gridToPixelRatio; }
-        }
-
-        public bool isOpenSquare(int GridX, int GridY)
-        {
-            return true;
-        }
-
-
-    }
-     */
 }
\ No newline at end of file