nickpons666/Shiip-of-Hakinian-Espanol
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Handle ignoring 0x3F for navi talk skips (#4364)

Browse Source
This commit is contained in:
Garrett Cox
2024-09-24 12:56:56 -05:00
committed by GitHub
parent 0f02201108
commit 4e4c1c4f8a
1 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
soh/soh/Enhancements/timesaver_hook_handlers.cpp
View File

@@ -317,9 +317,11 @@ void TimeSaverOnVanillaBehaviorHandler(GIVanillaBehavior id, bool* should, void*
case VB_NAVI_TALK: { case VB_NAVI_TALK: {
if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO)) { if (CVarGetInteger(CVAR_ENHANCEMENT("TimeSavers.NoForcedDialog"), IS_RANDO)) {
ElfMsg* naviTalk = static_cast<ElfMsg*>(opt); ElfMsg* naviTalk = static_cast<ElfMsg*>(opt);
Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F); if (((naviTalk->actor.params >> 8) & 0x3F) != 0x3F) {
Actor_Kill(&naviTalk->actor); Flags_SetSwitch(gPlayState, (naviTalk->actor.params >> 8) & 0x3F);
*should = false; Actor_Kill(&naviTalk->actor);
*should = false;
}
} }
break; break;
} }