From 8d4b9a4dab8f0db9a1505ef3eb69fb7da85004ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miloslav=20=C4=8C=C3=AD=C5=BE?= Date: Sat, 8 Sep 2018 07:52:43 +0200 Subject: [PATCH] Update --- game.cpp | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/game.cpp b/game.cpp index 32504cb..b77923f 100644 --- a/game.cpp +++ b/game.cpp @@ -686,12 +686,6 @@ public: mCamera.resolution.x = 110 / SUBSAMPLE; mCamera.resolution.y = 88; mCamera.shear = 0; - - mCamera.collisionRadius = UNITS_PER_SQUARE / 4; - mCamera.collisionHeightBelow = UNITS_PER_SQUARE; - mCamera.collisionHeightAbove = UNITS_PER_SQUARE / 3; - mCamera.collisionStepHeight = UNITS_PER_SQUARE / 2; - mVericalSpeed = 0; } }; @@ -934,7 +928,7 @@ int main() int16_t camX = divRoundDown(player.mCamera.position.x,UNITS_PER_SQUARE); int16_t camY = divRoundDown(player.mCamera.position.y,UNITS_PER_SQUARE); - if (player.mCamera.height - player.mCamera.collisionHeightBelow - + if (player.mCamera.height - CAMERA_COLL_HEIGHT_BELOW - floorHeightAt(camX,camY) < 2) player.mVericalSpeed = 200; // jump }