X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fcarfire;a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FDisplay.cs;h=d8f9a6bd9a9f78c24d1f42fe053d611218db4bb2;hp=fc2489530e8f53caea9de9b88f5f8ff99be9fb78;hb=f8846aea7e94e617bacb8e497d65fbbab9676717;hpb=1368c1af3d7a4a12b0b0577dbe3edbfd254e2d04

diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs
index fc24895..d8f9a6b 100644
--- a/CarFire/CarFire/CarFire/Display.cs
+++ b/CarFire/CarFire/CarFire/Display.cs
@@ -51,22 +51,6 @@ namespace CarFire
             mMap = contentManager.Load<Map>("Maps/stable");
             Map.DefaultTile = contentManager.Load<Texture2D>("default");
             mMap.CenterCell = new Vector2(currentCenterX,currentCenterY);
-            //Debugging... Spawn eight projectiles.
-            //Diagonals
-            /*
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5,5), 10, 10, 300, 300));
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, 5), 10, 10, 300, 300));
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5, -5), 10, 10, 300, 300));
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, -5), 10, 10, 300, 300));
-            //Vertical and horizontal
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(0, 5), 10, 10, 300, 300));
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(-5, 0), 10, 10, 300, 300));
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(5, 0), 10, 10, 300, 300));
-            mProjectiles.Add(new Projectile(mMap, everything, new Vector2(0, -5), 10, 10, 300, 300));
-            */
-
-            
-            // TODO: use this.Content to load your game content here
         }
 
         /// <summary>
@@ -160,10 +144,14 @@ namespace CarFire
                 {
 
                     mCharacters[i].MovePlayer(state.keysDown[i]);
-                    mMap.CenterCell = new Vector2(mCharacters[0].GridX, mCharacters[0].GridY);
+                   
                 }
             }
-            //Handle wall collisions of projectiles again...
+            if (mCharacters[0] != null)
+            {
+                mMap.CenterCell = new Vector2(mCharacters[0].PixelX / Map.PixelsToUnitSquares, mCharacters[0].PixelY / Map.PixelsToUnitSquares);
+            }
+                //Handle wall collisions of projectiles again...
             for (int i = 0; i < mProjectiles.Count; i++)
             {
                 if (!mMap.IsCellOpen(new Point(mProjectiles[i].GridX, mProjectiles[i].GridY)))
@@ -190,13 +178,26 @@ namespace CarFire
             foreach(Projectile projectile in mProjectiles)
             {
                 projectile.Draw(spriteBatch);
-                
             }
             for(int i = 0; i < 4; i++)//IPlayer character in mCharacters)
             {
-                if(mCharacters[i] != null)
+
+                if (mCharacters[i] != null)
+                {
                     mCharacters[i].Draw(spriteBatch);
-            } 
+                    if (Math.Abs(mCharacters[i].GridX - mCharacters[i].PixelX / Map.PixelsToUnitSquares) > 0.7f || 0.7f < Math.Abs(mCharacters[i].GridY - mCharacters[i].PixelY / Map.PixelsToUnitSquares))
+                    {
+                        //Console.WriteLine(Math.Abs(mCharacters[i].GridX - mCharacters[i].PixelX / Map.PixelsToUnitSquares));
+                        //Console.WriteLine(Math.Abs(mCharacters[i].GridY - mCharacters[i].PixelY / Map.PixelsToUnitSquares));
+                        Console.WriteLine("Begin");
+                        Console.WriteLine(mCharacters[i].GridX);
+                        Console.WriteLine(mCharacters[i].GridY);
+                        Console.WriteLine(mCharacters[i].PixelX / Map.PixelsToUnitSquares);
+                        Console.WriteLine(mCharacters[i].PixelY / Map.PixelsToUnitSquares);
+                    }
+                }
+            }
+            
         }
         /// <summary>
         /// Add a projectile to the Display.