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.

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 being stuck when dive-rolling in a place that only has enough room to go prone #33

Merged
merged 1 commit into from
Mar 30, 2016
Merged

Conversation

TomyLobo
Copy link
Collaborator

This patch fixes a few instances of being stuck after a dive-roll by setting the player to prone when that situation is encountered.

I'm not quite sure if that's the correct way to switch from roll to prone. It appears to work, though.

I'm also not entirely sure if removing that "return" in CDAGameMovement::RealPlayerMove has any side effects, but I noticed none.
Removing it was a requirement for CDAGameMovement::Duck, and thus the mitigation code, to run in all instances of stuckness (that I've been able to reproduce).

Same changes as #30 but retargeted to the develop branch.

@TomyLobo TomyLobo force-pushed the develop branch 2 times, most recently from 5e4152f to ba8390e Compare March 27, 2016 01:50
@BSVino
Copy link
Owner

BSVino commented Mar 29, 2016

I can't say either whether removing the return will cause any problems. Have you looked in the annotations for its history?

@TomyLobo
Copy link
Collaborator Author

This has been taken from CGameMovement::PlayerMove, i.e. it's probably from the original sdk.

@BSVino
Copy link
Owner

BSVino commented Mar 30, 2016

It's probably fine then. Ship it.

@TomyLobo TomyLobo merged commit 1150338 into BSVino:develop Mar 30, 2016
@TomyLobo TomyLobo deleted the fix-stuck branch March 30, 2016 10:58
@TomyLobo TomyLobo added this to the v1.2.1 milestone Apr 3, 2016
TomyLobo added a commit that referenced this pull request Apr 20, 2016
Fix being stuck when dive-rolling in a place that only has enough room to go prone
shmopaloppa pushed a commit to shmopaloppa/DoubleAction that referenced this pull request Sep 13, 2017
Fix being stuck when dive-rolling in a place that only has enough room to go prone
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants