Hri7566
/
sm64ex-coop
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Beta 32.0.2 (#330)

This commit is contained in:
Agent X 2023-03-26 15:17:58 -04:00 committed by GitHub
parent 45c2d3852f
commit db940ef1dd
2 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/game/interaction.c
View File

@ -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;

2
src/pc/network/version.h
View File

@ -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