Skip to content

Fix missing states in getPedControlState #3785

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

Merged
merged 1 commit into from
Oct 13, 2024
Merged

Fix missing states in getPedControlState #3785

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 3 additions & 6 deletions Client/mods/deathmatch/logic/CClientPad.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -336,11 +336,9 @@ bool CClientPad::GetControlState(const char* szName, CControllerState& State, bo
return State.LeftShoulder2 == 255;
break; // zoom out
case 9:
return false;
break; // enter_exit
return State.ButtonTriangle == 255; // enter_exit
case 10:
return false;
break; // change_cam
return State.Select == 255; // change_cam
case 11:
return State.ButtonSquare == 255;
break; // jump
Expand Down Expand Up @@ -432,8 +430,7 @@ bool CClientPad::GetControlState(const char* szName, CControllerState& State, bo
return State.RightShoulder2 == 255;
break; // look right
case 33:
return false;
break; // look behind
return State.LeftShoulder2 == 255 && State.RightShoulder2 == 255; // look behind
case 34:
return false;
break; // mouse look
Expand Down
Loading