vrmiguel
/
sm64pc
mirror of https://github.com/sm64pc/sm64pc.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #5 from Agent-11/moon 

God mode: Walk on lava
This commit is contained in:
Llennpie 2021-12-26 19:34:12 -05:00 committed by GitHub
parent 3be1aa71ee 3deec37c2c
commit 5fe22cf50d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/game/interaction.c
View File

@ -24,6 +24,7 @@
#include "sound_init.h"
#include "thread6.h"
#include "moon/achievements/achievements.h"
#include "moon/saturn/saturn_types.h"
#define INT_GROUND_POUND_OR_TWIRL (1 << 0) // 0x01
#define INT_PUNCH (1 << 1) // 0x02
@ -1844,7 +1845,7 @@ void mario_handle_special_floors(struct MarioState *m) {
break;
}
if (!(m->action & ACT_FLAG_AIR) && !(m->action & ACT_FLAG_SWIMMING)) {
if (!(m->action & ACT_FLAG_AIR) && !(m->action & ACT_FLAG_SWIMMING) && !enable_god) {
switch (floorType) {
case SURFACE_BURNING:
check_lava_boost(m);