Map item processing refactoring #39942
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
ifreund
added
[C++]
|
probably conflicts with #39406 |
|
You haven't made any edits in these areas at least yet. |
|
oh good, i was worried it would cause a merge conflict like the last one. i only skimmed it, i didn't try to review it. |
Drewscriver
pushed a commit
to Drewscriver/Cataclysm-DDA
that referenced
this pull request
Apr 30, 2020
* remove processor * remove map_process_func * remove signal and gridz * unused boolean in process_items * removed process_items * removed process_active_items instead of process_items * made process_items public * astyle * activate is always false here * remove process_item * astyle
This was referenced May 3, 2020
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 "Map item processing refactoring"Purpose of change
The chain of functions for processing items on map is weird and hard to follow.
There are also many things that are in there but do not do anything.
Describe the solution
processorpointer to a function. The function is always the sameprocess_map_itemsso this was pointless. Now they just call the function.signal.gridz.process_itemsis always true and was only used in an or statement where it did nothing. Removed the boolean.process_active_itemsdid was set the above unneeded boolean to true and then callprocess_items. Removedprocess_active_itemsand instead just callprocess_items.process_itemswas made public so it can be called.process_itemalways passes along a boolean false. Just have false in the final palce.process_map_itemsdoes nothing but callprocess_item. Replaceprocess_itemwithprocess_map_items.Describe alternatives you've considered
Let it stay as unreadable mess of functions calling other functions calling other functions without clearly stating what function is called while passing variables that do nothing.
Testing
Tests pass, items still get processed in inventory, on ground and in vehicles.
Additional context
There should be zero visible changes in gameplay.