Commit 51ffeefd authored by gerstrong@gmail.com's avatar gerstrong@gmail.com

Collision improvements with Switches

parent a830ca43
......@@ -412,10 +412,7 @@ void CPlayerLevel::handleInputOnGround()
// He could press up and do further actions
if( py < 0 )
{
if(!verifyforPole())
{
processPressUp();
}
processPressUp();
}
......@@ -1527,12 +1524,12 @@ bool CPlayerLevel::verifySwitches()
}
void CPlayerLevel::processPressUp()
{
// If a switch is being pressed we are done!
{
// If a switch is being pressed
if(verifySwitches())
{
return;
}
}
std::vector<CTileProperties> &Tile = gBehaviorEngine.getTileProperties(1);
const int x_left = (getXLeftPos()>>CSF)<<CSF;
......@@ -1666,15 +1663,18 @@ void CPlayerLevel::processPressUp()
return;
}
}
}
if(verifyforPole())
{
return;
}
// If the above did not happen, then just look up
setAction(A_KEEN_LOOKUP);
return;
}
......
......@@ -249,7 +249,7 @@ public:
/**
* This function will process everything that happens when player presses up
*/
void processPressUp();
void processPressUp();
/**
* This function will ensure that Keen keeps ducking
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment