This commit is contained in:
Miloslav Číž 2018-09-08 07:52:43 +02:00
parent d7aad665e2
commit 8d4b9a4dab

View file

@ -686,12 +686,6 @@ public:
mCamera.resolution.x = 110 / SUBSAMPLE; mCamera.resolution.x = 110 / SUBSAMPLE;
mCamera.resolution.y = 88; mCamera.resolution.y = 88;
mCamera.shear = 0; 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; mVericalSpeed = 0;
} }
}; };
@ -934,7 +928,7 @@ int main()
int16_t camX = divRoundDown(player.mCamera.position.x,UNITS_PER_SQUARE); int16_t camX = divRoundDown(player.mCamera.position.x,UNITS_PER_SQUARE);
int16_t camY = divRoundDown(player.mCamera.position.y,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) floorHeightAt(camX,camY) < 2)
player.mVericalSpeed = 200; // jump player.mVericalSpeed = 200; // jump
} }