Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix sliding player clipping through floor #2838

Merged
merged 2 commits into from
Apr 1, 2024
Merged

Fix sliding player clipping through floor #2838

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b9c3c3
Fix slider clipping through floor
weluvgoatz Mar 22, 2024
f164569
Add a line break
weluvgoatz Mar 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/object/player.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -793,13 +793,8 @@ Player::update(float dt_sec)

//if you stop holding down when sliding, then it stops.
//or, stop sliding if you come to a stop and are not on a slope.
if (!m_controller->hold(Control::DOWN))
{
m_sliding = false;
m_was_crawling_before_slide = false;
m_slidejumping = false;
}
else if (m_floor_normal.y == 0.f && std::abs(m_physic.get_velocity_x()) <= 1.f)

if (!m_controller->hold(Control::DOWN) || (m_floor_normal.y == 0.f && std::abs(m_physic.get_velocity_x()) <= 1.f))
tobbi marked this conversation as resolved.
Show resolved Hide resolved
{
if (is_big())
{
Expand Down
Loading