Implement #804, move some functions to Units - #812
Merged
Conversation
…put, a little cleanup
Member
|
@kazimuth you've got some trailing whitespace that Travis is objecting to. |
Contributor
Author
|
Fixed, thanks @BenLubar. |
Member
|
I think references don't work in titles. |
Member
|
Need to confirm if this stuff works with MSVC and GCC 4.5: // ZONE FILTERS (as in, filters used by 'zone')
// Maps parameter names to filters.
unordered_map<string, function<bool(df::unit*)>> zone_filters = {
{ "caged", isContainedInItem },
{ "egglayer", isEggLayer }, |
Member
|
Merge conflict is just in the |
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Also colorize output from the zone plugin, and clean it up a tiny bit.