refactor: Decouple attitude from creature #4069
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
scarf005
requested changes
Jan 6, 2024
|
oww, some functions used them as int |
scarf005
approved these changes
Jan 6, 2024
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.
Purpose of change
Decouple creature attitude from creature so as to reduce the inclusion of
creature.h.Describe the solution
Changed Attitude from being an internal enum of Creature to simply being an enum, now defined in
enums.h. Fixed code after this refactor by bash scripts:for FILE in $(find ./ -name '*.cpp' -or -name '*.h'); do sed -i -E 's@(Creature::)*(Attitude::)*(A_HOSTILE|A_NEUTRAL|A_FRIENDLY|A_ANY)@Attitude::\3@g' $FILE; done,for FILE in $(find ./ -name '*.cpp' -or -name '*.h'); do sed -i -E 's@Creature::Attitude@Attitude@g' $FILE; doneandfor FILE in $(find ./ -name '*.cpp' -or -name '*.h'); do sed -i -E 's@MFAttitude::@MF@g' $FILE; done.Describe alternatives you've considered
None.
Testing
Tested if the code compiles by
make LUA=0 TILES=1 SOUND=1 RELEASE=1.