Restructure event flags in z64save.h (1/?) #2380
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
cadmic
reviewed
Dec 18, 2024
include/z64save.h
Outdated
| #define SET_EVENTCHKINF(flag) (gSaveContext.save.info.eventChkInf[(flag) >> 4] |= (1 << ((flag) & 0xF))) | ||
| #define CLEAR_EVENTCHKINF(flag) (gSaveContext.save.info.eventChkInf[(flag) >> 4] &= ~(1 << ((flag) & 0xF))) | ||
|
|
||
| #define GET_EVENTCHKINF_MASK(flag) (1 << ((flag) & 0xF)) |
There was a problem hiding this comment.
this could be used in the definitions of GET_EVENTCHKINF etc above. It might be nice to also give a name to (flag) >> 4 since this is used a couple times below too. How something like
#define EVENTCHKINF_INDEX(flag) ((flag) >> 4)
#define EVENTCHKINF_MASK(flag) (1 << ((flag) & 0xF))
#define GET_EVENTCHKINF(flag) (gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX(flag)] & EVENTCHKINF_MASK(flag))
#define SET_EVENTCHKINF(flag) (gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX(flag)] |= EVENTCHKINF_MASK(flag))
#define CLEAR_EVENTCHKINF(flag) (gSaveContext.save.info.eventChkInf[EVENTCHKINF_INDEX(flag)] &= ~EVENTCHKINF_MASK(flag))I don't think GET_ is necessary, especially since it could be interpreted as getting the flag value itself.
|
I think splitting this into parts is a great idea, thanks for doing that |
cadmic
approved these changes
Dec 19, 2024
fig02
approved these changes
Dec 21, 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.
Contributions made in this pr are licensed under CC0
See #2303 for what the final changes may look like. The end goal is to ultimately create create flagIds for all flags, allowing you to extract w/e info using the flagId macros.
This pr implements
GET_*_MASKmacros, and converts most flags to use those instead. This macro is necessary to break up #2303 into multiple prs in a clean way.