Fix Child Zelda Skip rando setting always on#871
Merged
dcvz merged 7 commits intoHarbourMasters:develop-rachaelfrom Jul 21, 2022
Merged
Fix Child Zelda Skip rando setting always on#871dcvz merged 7 commits intoHarbourMasters:develop-rachaelfrom
dcvz merged 7 commits intoHarbourMasters:develop-rachaelfrom
Conversation
Contributor
|
it doesn't seem to be "always on". for me it seems somewhat random. maybe something is not initialized? |
Contributor
diff --git a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
index 5deea40..4f7c2d1 100644
--- a/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
+++ b/soh/soh/Enhancements/randomizer/3drando/spoiler_log.cpp
@@ -42,7 +42,7 @@ static RandomizerHash randomizerHash;
static SpoilerData spoilerData;
void GenerateHash() {
- for (size_t i = 0; i < Settings::seed.size(); i++) {
+ for (size_t i = 0; i < Settings::hashIconIndexes.size(); i++) {
int number = Settings::seed[i] - '0';
Settings::hashIconIndexes[i] = number;
}
diff --git a/soh/soh/Enhancements/randomizer/randomizer.cpp b/soh/soh/Enhancements/randomizer/randomizer.cpp
index 09704e8..9091434 100644
--- a/soh/soh/Enhancements/randomizer/randomizer.cpp
+++ b/soh/soh/Enhancements/randomizer/randomizer.cpp
@@ -4756,4 +4756,4 @@ void Rando_Init(void) {
InitRando();
}
-}
\ No newline at end of file
+}this diff should work instead. |
Contributor
Author
|
To close the thread: the actual issue was indeed something stomping memory after reading in the cvar. Regressing commit was briaguya0@b00c3dd#diff-b38d7696c710c1302dee46cebfa8a7ef693286dacfb3d79c910446d648dc1183 |
crowell
suggested changes
Jul 21, 2022
dcvz
suggested changes
Jul 21, 2022
dcvz
approved these changes
Jul 21, 2022
Contributor
dcvz
left a comment
There was a problem hiding this comment.
Looks great! Good job to all, figuring this one out :)
Contributor
|
@jbodner09 sorry one more thing: this would be a great fix to have in Rachael's second release. Could you point this at |
briaguya0
approved these changes
Jul 21, 2022
Kenix3
approved these changes
Jul 21, 2022
Collaborator
Kenix3
left a comment
There was a problem hiding this comment.
We'll also need a PR for zhora.
Kenix3
pushed a commit
to Kenix3/Shipwright
that referenced
this pull request
Oct 19, 2022
Fix Child Zelda Skip rando setting always on
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
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.
The setting was being written improperly to the spoiler log and also read improperly. It's now being written as a string and then manually set as an int like all other rando settings. Closes #859