Factor out map::has_nearby_table for eating/butchering checks #37790
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
The algorithm for nearby table location is done in at least 3 places: - src/activity_handlers.cpp:L412-419 - src/activity_item_handling.cpp:L1428-1435 - src/consumption.cpp:L845-850 Moving `has_nearby_table` as a new function it into map.cpp made it obvious that this is where it actually belongs; there it can fit neatly alongside its brethren like `has_nearby_fire`. This commit only adds the new function; refactoring will come next.
Factoring out the similar loops to check for nearby tables, and using the new `map::has_nearby_table` function instead.
ZhilkinSerg
added
[C++]
This was referenced Feb 9, 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 "Factor out function to check for nearby table"Purpose of change
Code encapsulation and modularity
Describe the solution
Following the pattern of
has_nearby_fireinsrc/map.cpp, the new functionmap::has_nearby_tablereturns true if a point within a radius has a flat surface or vehicle kitchen. This allows replacing a similar chunk of three other files with a call to the new function.Describe alternatives you've considered
Testing
Tested some table-based activities with and without a table within the needed radius:
Additional context
Spin-off of #37713