github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-08-19 04:50:05 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Market Sneak with masks (#3047)

Browse source
This commit is contained in:
aMannus 2023-07-13 03:57:43 +02:00 • committed by GitHub
commit 22e4020265
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

7
soh/src/overlays/actors/ovl_En_Heishi4/z_en_heishi4.c
View file

@ -334,7 +334,12 @@ void func_80A56B40(EnHeishi4* this, PlayState* play) {
return; return;
} }
if (this->type == HEISHI4_AT_MARKET_NIGHT) { if (this->type == HEISHI4_AT_MARKET_NIGHT) {
if (CVarGetInteger("gMarketSneak", 0)) { Player* player = GET_PLAYER(play);
// Only allow sneaking when not wearing a mask as that triggers different dialogue. MM Bunny hood disables
// these interactions, so bunny hood is fine in that case.
if (CVarGetInteger("gMarketSneak", 0) &&
(player->currentMask == PLAYER_MASK_NONE ||
(player->currentMask == PLAYER_MASK_BUNNY && CVarGetInteger("gMMBunnyHood", 0)))) {
this->actionFunc = EnHeishi4_MarketSneak; this->actionFunc = EnHeishi4_MarketSneak;
} else { } else {
this->actionFunc = func_80A56614; this->actionFunc = func_80A56614;