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

Fix another infinite climb bug #144

Merged
merged 4 commits into from
Nov 13, 2018
Merged

Fix another infinite climb bug #144

Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6e94acb
Invert if condition
TomyLobo Nov 11, 2018
8bc5045
Invert another if condition
TomyLobo Nov 11, 2018
f0e3302
Remove useless conditional
TomyLobo Nov 11, 2018
a47b016
Use the wall normal instead of the player's forward vector to determi…
TomyLobo Nov 11, 2018
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
Prev Previous commit
Next Next commit
Remove useless conditional 
Since CheckMantel returned true, m_pSDKPlayer->m_Shared.IsManteling() can't possibly be false here.
CheckMantel() returns true under one of two conditions:
1. m_pSDKPlayer->m_Shared.IsManteling() is true
2. m_pSDKPlayer->m_Shared.StartManteling has just been called, which sets the member variable returned by m_pSDKPlayer->m_Shared.IsManteling() to true

So since this is useless and confusing, I'm removing it.
  • Loading branch information
@TomyLobo
TomyLobo committed Nov 11, 2018
commit f0e3302626cbb8eccacd4a207dd43ef2b3ac898d
2 changes: 0 additions & 2 deletions mp/src/game/shared/sdk/sdk_gamemovement.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2869,8 +2869,6 @@ void CSDKGameMovement::FullWalkMove ()
}

mv->SetAbsOrigin (tr.endpos);
if (!m_pSDKPlayer->m_Shared.IsManteling())
return;

// Try to push the player onto the ledge.
Vector vecOrigin = mv->GetAbsOrigin();
Expand Down