X-Git-Url: https://git.dogcows.com/gitweb?a=blobdiff_plain;f=CarFire%2FCarFire%2FCarFire%2FDisplay.cs;h=9e06485af34a242af1bc86187e68eb02637eeba8;hb=109c7d277adc8e347600922fea6a8d73d4c5f01c;hp=d8f9a6bd9a9f78c24d1f42fe053d611218db4bb2;hpb=f8846aea7e94e617bacb8e497d65fbbab9676717;p=chaz%2Fcarfire diff --git a/CarFire/CarFire/CarFire/Display.cs b/CarFire/CarFire/CarFire/Display.cs index d8f9a6b..9e06485 100644 --- a/CarFire/CarFire/CarFire/Display.cs +++ b/CarFire/CarFire/CarFire/Display.cs @@ -117,7 +117,7 @@ namespace CarFire if(mCharacters[j] != null) for (int i = 0; i < mProjectiles.Count; i++) { - if (mProjectiles[i].GridX == mCharacters[j].GridX && mProjectiles[i].GridY == mCharacters[j].GridY) + if (mProjectiles[i].GridX == mCharacters[j].Coordinates.X && mProjectiles[i].GridY == mCharacters[j].Coordinates.Y) { mCharacters[j].causeDamageTo(mProjectiles[i].Damage); Console.WriteLine(mCharacters[j].Health); @@ -134,22 +134,20 @@ namespace CarFire { if (state.keysDown[i].Contains(Keys.Enter)) { - mCharacters[i] = (new Human(mMap, "", everything, projectile1, this)); - mCharacters[i].GridX = mMap.GetStartingPositionForPlayer(i + 1).X; - mCharacters[i].GridY = mMap.GetStartingPositionForPlayer(i + 1).Y; + mCharacters[i] = new Human(mMap, "", everything, projectile1, this, mMap.GetStartingPositionForPlayer(i+1)); } } //Regular player input updates else { - mCharacters[i].MovePlayer(state.keysDown[i]); + mCharacters[i].MovePlayer(timespan, state.keysDown[i]); } } if (mCharacters[0] != null) { - mMap.CenterCell = new Vector2(mCharacters[0].PixelX / Map.PixelsToUnitSquares, mCharacters[0].PixelY / Map.PixelsToUnitSquares); + mMap.CenterCell = mCharacters[0].Position; } //Handle wall collisions of projectiles again... for (int i = 0; i < mProjectiles.Count; i++) @@ -185,16 +183,7 @@ namespace CarFire 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); - } + } }