This commit is contained in:
parent
e48a600c2d
commit
904f83633e
1 changed files with 3 additions and 2 deletions
|
@ -498,7 +498,8 @@ void CPlayer::thinkHorizontalMovement()
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
// In the air
|
// In the air
|
||||||
if(!(colHeight<0&&m_currentState==STATE_JUMP)) // Lets you jump through platforms from below
|
// if(!(colHeight<0&&m_currentState==STATE_JUMP)) // Lets you jump through platforms from below
|
||||||
|
if(colHeight>=0) // Lets you jump through platforms from below
|
||||||
{
|
{
|
||||||
colHeight=m_layerCollision->getHeightFromGround(Pos.vx+(m_moveVel.vx>>VELOCITY_SHIFT),Pos.vy,5);
|
colHeight=m_layerCollision->getHeightFromGround(Pos.vx+(m_moveVel.vx>>VELOCITY_SHIFT),Pos.vy,5);
|
||||||
if(colHeight<0)
|
if(colHeight<0)
|
||||||
|
@ -815,7 +816,7 @@ return false;
|
||||||
if right half of player is hanging or 0 if no part of the
|
if right half of player is hanging or 0 if no part of the
|
||||||
player is hanging
|
player is hanging
|
||||||
---------------------------------------------------------------------- */
|
---------------------------------------------------------------------- */
|
||||||
int csize=15;
|
int csize=5;
|
||||||
int cheight=15;
|
int cheight=15;
|
||||||
int CPlayer::isOnEdge()
|
int CPlayer::isOnEdge()
|
||||||
{
|
{
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue