Migrate ACT_AIM to the activity actor system #40684
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Allows performing cleanup when Character::cancel_activity() is called.
Stops terrain from flickering on CURSES while aiming with shifted view
Stops this query from popping up when holding '.' for "Aim" in target ui on CURSES or TILES with low fps
olanti-p
changed the title
The old thing doesn't work on clang 7
curstwist
added
Code: Infrastructure / Style / Static Analysis
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Summary
SUMMARY: Infrastructure "Migrated ACT_AIM to the activity actor system"
Purpose of change
Contributes to #40013
Fixes "Ignore this kind of distraction" not working for
ACT_AIMFixes terrain view flickering if aiming on CURSES with shifted view
Fixes interrupting
ACT_AIMwhile aimingRELOAD_AND_SHOOTweapons would leave those weapons loadedDescribe the solution
First commit is from #40683, other commits should be self-explanatory.
targeting_dataexisted due to limitations of the old activity system; it is gone now.Due to conflicting default key, added a switch that would disable interruption of activity with player input (
.is default key for aiming in target ui and.also offers to cancel current activity)Testing
Aimed and fired (including loading an autosave made while aiming):
RM88 battle rifle,composite bow,Assault barbsmutation andFinger-Mounted Laserbionic. Spawned a zombie technician and let it pull the gun out of my hands - activity is cancelled as intended.Additional context
There is a debug message when unloading bows, looks like a case of #40125 or some other related bug