Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Persistent Mask Crash on Talking to Postman #969

Merged
merged 2 commits into from
Jan 26, 2025
Merged

Fix Persistent Mask Crash on Talking to Postman #969

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6ac0e72
Fix persistent mask crash on talking to postman
zodiac-ill Jan 26, 2025
5ab36df
feedback
zodiac-ill Jan 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion mm/2s2h/Enhancements/Masks/PersistentMasks.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ void RegisterPersistentMasks() {

// But don't speed up if the player is non-human and controller input is being overriden for cutscenes/minigames
// or if player is Kafei
if (STATE_CVAR && player->actor.id == ACTOR_PLAYER &&
if (player && STATE_CVAR && player->actor.id == ACTOR_PLAYER &&
(GET_PLAYER_FORM == PLAYER_FORM_HUMAN || gPlayState->actorCtx.unk268 == 0)) {
*should = true;
}
Expand Down
4 changes: 2 additions & 2 deletions mm/src/overlays/actors/ovl_En_Mm3/z_en_mm3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -467,8 +467,8 @@ void func_80A6FEEC(EnMm3* this, PlayState* play) {
s32 func_80A6FFAC(EnMm3* this, PlayState* play) {
switch (GET_PLAYER_FORM) {
case PLAYER_FORM_HUMAN:
if (GameInteractor_Should(VB_CONSIDER_BUNNY_HOOD_EQUIPPED, Player_GetMask(play) == PLAYER_MASK_BUNNY),
GET_PLAYER(play)) {
if (GameInteractor_Should(VB_CONSIDER_BUNNY_HOOD_EQUIPPED, Player_GetMask(play) == PLAYER_MASK_BUNNY,
GET_PLAYER(play))) {
if (this->unk_2B2 & 0x10) {
return true;
}
Expand Down
Loading