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

Merge branch 'coop' of github.com:sm64ex-coop-dev/sm64ex-coop into coop

This commit is contained in:
MysterD 2023-04-02 21:19:04 -07:00
parent 20103bd287 4b724d9963
commit dbde7dc22e
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/game/mario.c
View File

@ -2007,6 +2007,7 @@ s32 execute_mario_action(UNUSED struct Object *o) {
np->fadeOpacity += 2;
gMarioState->fadeWarpOpacity = np->fadeOpacity << 3;
}
}
if (gServerSettings.enableCheats) {
if (gCheats.godMode) {
@ -2019,7 +2020,6 @@ s32 execute_mario_action(UNUSED struct Object *o) {
gMarioState->numLives = 100;
}
}
}
if (gMarioState->action) {
if (gMarioState->action != ACT_BUBBLED) {

4
src/game/mario_step.c
View File

@ -338,7 +338,7 @@ s32 perform_ground_step(struct MarioState *m) {
smlua_call_event_hooks_mario_param(HOOK_BEFORE_PHYS_STEP, m);
if (gServerSettings.enableCheats && gCheats.superSpeed && m->playerIndex == 0) {
if (gServerSettings.enableCheats && gCheats.superSpeed && m->playerIndex == 0 && m->action != ACT_BUBBLED) {
m->vel[0] *= SUPER_SPEED_MULTIPLIER;
m->vel[2] *= SUPER_SPEED_MULTIPLIER;
}
@ -689,7 +689,7 @@ s32 perform_air_step(struct MarioState *m, u32 stepArg) {
smlua_call_event_hooks_mario_param(HOOK_BEFORE_PHYS_STEP, m);
if (gServerSettings.enableCheats && gCheats.superSpeed && m->playerIndex == 0) {
if (gServerSettings.enableCheats && gCheats.superSpeed && m->playerIndex == 0 && m->action != ACT_BUBBLED) {
m->vel[0] *= SUPER_SPEED_MULTIPLIER;
m->vel[2] *= SUPER_SPEED_MULTIPLIER;
}