From db940ef1dd3a04169e011e906e0260c9414312d5 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Sun, 26 Mar 2023 15:17:58 -0400 Subject: [PATCH] Beta 32.0.2 (#330) --- src/game/interaction.c | 4 +--- src/pc/network/version.h | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/src/game/interaction.c b/src/game/interaction.c index 1126ea29..7b9a40dc 100644 --- a/src/game/interaction.c +++ b/src/game/interaction.c @@ -849,7 +849,7 @@ void reset_mario_pitch(struct MarioState *m) { } u32 interact_coin(struct MarioState *m, UNUSED u32 interactType, struct Object *o) { - if (m != &gMarioStates[0]) { + if (m != &gMarioStates[0] || (gDjuiInMainMenu && gCurrLevelNum == LEVEL_TTM)) { // only collect locally return FALSE; } @@ -2183,8 +2183,6 @@ void check_kick_or_punch_wall(struct MarioState *m) { } void mario_process_interactions(struct MarioState *m) { - if (gDjuiInMainMenu) { return; } - sDelayInvincTimer = FALSE; sInvulnerable = (m->action & ACT_FLAG_INVULNERABLE) || m->invincTimer != 0; diff --git a/src/pc/network/version.h b/src/pc/network/version.h index f4547fb0..e6f944ee 100644 --- a/src/pc/network/version.h +++ b/src/pc/network/version.h @@ -4,7 +4,7 @@ #define VERSION_TEXT "beta" #define VERSION_NUMBER 32 #define MINOR_VERSION_NUMBER 0 -#define PATCH_VERSION_NUMBER 1 +#define PATCH_VERSION_NUMBER 2 #define MAX_VERSION_LENGTH 10 #define MAX_LOCAL_VERSION_LENGTH 12