mirror
/
Shipwright
mirror of https://github.com/HarbourMasters/Shipwright.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixes choose-quest with missing MQ crash. (#1903)

This commit is contained in:
Christopher Leggett 2022-11-03 12:29:25 -04:00 committed by GitHub
parent c5940905e7
commit 75af33a04c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
soh/src/overlays/gamestates/ovl_file_choose/z_file_choose.c
View File

@ -663,8 +663,22 @@ void FileChoose_UpdateQuestMenu(GameState* thisx) {
if (ABS(this->stickRelX) > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT | BTN_DRIGHT))) {
if (this->stickRelX > 30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DRIGHT))) {
this->questType[this->buttonIndex] += 1;
if (this->questType[this->buttonIndex] == MASTER_QUEST && !ResourceMgr_GameHasMasterQuest()) {
// the only case not handled by the MIN/MAX_QUEST logic below. This will either put it at
// above MAX_QUEST in which case it will wrap back around, or it will put it on MAX_QUEST
// in which case if MAX_QUEST even is that number it will be a valid selection that won't
// crash.
this->questType[this->buttonIndex] += 1;
}
} else if (this->stickRelX < -30 || (dpad && CHECK_BTN_ANY(input->press.button, BTN_DLEFT))) {
this->questType[this->buttonIndex] -= 1;
if (this->questType[this->buttonIndex] == MASTER_QUEST && !ResourceMgr_GameHasMasterQuest()) {
// the only case not handled by the MIN/MAX_QUEST logic below. This will either put it at
// below MIN_QUEST in which case it will wrap back around, or it will put it on MIN_QUEST
// in which case if MIN_QUEST even is that number it will be a valid selection that won't
// crash.
this->questType[this->buttonIndex] -= 1;
}
}
if (this->questType[this->buttonIndex] > MAX_QUEST) {