Created and implemented a PosType enum#3971
Closed
link5669 wants to merge 13 commits intoHarbourMasters:developfrom
Closed
Created and implemented a PosType enum#3971link5669 wants to merge 13 commits intoHarbourMasters:developfrom
link5669 wants to merge 13 commits intoHarbourMasters:developfrom
Conversation
stratomaster64
approved these changes
Feb 23, 2024
Comment on lines
-425
to
+434
| if (CVarGetInteger("gHeartsCountPosType", 0) != 0) { | ||
| if (CVarGetInteger("gHeartsCountPosType", 0) != ORIGINAL_LOCATION) { | ||
| offsetY = CVarGetInteger("gHeartsCountPosY", 0)+Y_Margins+(HeartsScale*15); | ||
| if (CVarGetInteger("gHeartsCountPosType", 0) == 1) {//Anchor Left | ||
| if (CVarGetInteger("gHeartsCountPosType", 0) == ANCHOR_LEFT) { | ||
| offsetX = OTRGetDimensionFromLeftEdge(CVarGetInteger("gHeartsCountPosX", 0)+X_Margins+70.0f); | ||
| } else if (CVarGetInteger("gHeartsCountPosType", 0) == 2) {//Anchor Right | ||
| } else if (CVarGetInteger("gHeartsCountPosType", 0) == ANCHOR_RIGHT) { | ||
| X_Margins = Right_LM_Margin; | ||
| offsetX = OTRGetDimensionFromRightEdge(CVarGetInteger("gHeartsCountPosX", 0)+X_Margins+70.0f); | ||
| } else if (CVarGetInteger("gHeartsCountPosType", 0) == 3) {//Anchor None | ||
| } else if (CVarGetInteger("gHeartsCountPosType", 0) == ANCHOR_NONE) { | ||
| offsetX = CVarGetInteger("gHeartsCountPosX", 0)+70.0f; | ||
| } else if (CVarGetInteger("gHeartsCountPosType", 0) == 4) {//Hidden | ||
| } else if (CVarGetInteger("gHeartsCountPosType", 0) == HIDDEN) { |
Contributor
There was a problem hiding this comment.
Kinda funny to see changes on commented code
Member
|
I think the place that makes the most sense to me for this would be cosmeticsTypes.h |
jbodner09
suggested changes
Feb 24, 2024
| static u8 changed = 0; | ||
| u8 reset = 0; | ||
|
|
||
| switch (this->trailType) { //there HAS to be a better way to do this. |
Contributor
There was a problem hiding this comment.
It looks like this PR is incorporating changes from another PR that are unrelated to this one. Specifically, these changes here appear to be from #3973. Would it be possible to rebase this PR or open a new one with only the changes you intended to make for this PR?
Contributor
Author
There was a problem hiding this comment.
Oh yikes, sorry about that. I'll do that right now
This reverts commit 34fccee.
Contributor
|
As with #3973, going to close this for now. If the creator (or anyone else) feels like picking this up again, feel free to open another PR. |
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
6 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.
This PR resolves issue #2971. The enum declaration was included in z64.h and was implemented in place of the magic numbers that were there before. I wasn't sure where to put the enum declaration, so I consulted @briaguya-ai and they said they'd comment on the PR if there's a better place to include it.
Build Artifacts