-
Notifications
You must be signed in to change notification settings - Fork 2.6k
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 carryall not removing influence when cargo dies #20490
Conversation
9766921
to
b498e3b
Compare
b498e3b
to
cf4035d
Compare
209de5b
to
5755c27
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Actually marking the TakeOff
activity as uninterruptible doesn't seem right. When nothing inside the activity itself goes wrong, but the player decides they want to have a carryall that has descended to pick up a unit to stay landed, they cannot prevent it from taking off. That makes me think that #20403 was the incorrect fix to begin with. (And #20401 as well, unfortunately both PRs were merged with basically just one +1. The real bug is the state Land
leaves us with.)
#20212 just exposed issues with the aircraft landing code which probably didn't work properly for quite some time already. I concede that fixing that is out of scope for the next release though, so I think we can take this PR.
9388904
to
00a1809
Compare
00a1809
to
6cd878a
Compare
6cd878a
to
597ced6
Compare
29f9aaf
to
193cf0f
Compare
added more documentation |
ca63a34
to
db714cf
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ok
Add OpenRA#20490 to fix carryall crash, with rebase mess fixed.
Fixes #20468
An oversight from #16509 and then #20403
Here we make sure we properly handle cancelling regardless of where it was called. We cancel all child activities then set
ChildHasPriority
to true andIsInterruptible
to false so that theTakeoff
would run regardless of PickupUnit code and condition.