Small quality of life changes

Disabled fixed collision in sm74 by default.
Popping should now completely set the popped player's speed to 0.
This commit is contained in:
Sunk 2023-01-14 14:07:53 -05:00
parent 15d1ca06cb
commit 846327775a
2 changed files with 2 additions and 4 deletions

View File

@ -29,7 +29,7 @@ gBehaviorValues.dialogs.KoopaQuickThiWinDialog = DIALOG_031
-- force server settings --
---------------------------
gLevelValues.fixCollisionBugs = 1
gServerSettings.skipIntro = 1
--------------
-- movtexs --

View File

@ -1047,9 +1047,7 @@ s32 act_bubbled(struct MarioState* m) {
m->health = 0x100;
m->marioObj->oIntangibleTimer = 0;
m->peakHeight = m->pos[1];
m->vel[0] = 0;
m->vel[1] = 0;
m->vel[2] = 0;
mario_set_forward_vel(m, 0.0f);
m->marioObj->header.gfx.node.flags &= ~GRAPH_RENDER_INVISIBLE;
if (m->playerIndex == 0) {
soft_reset_camera(m->area->camera);