From 54d5a5a6f786bdab6719700e4501b27e2256197f Mon Sep 17 00:00:00 2001 From: Isaac0-dev <62234577+Isaac0-dev@users.noreply.github.com> Date: Tue, 7 Jan 2025 08:55:58 +1000 Subject: [PATCH] fix this --- src/game/level_update.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/game/level_update.c b/src/game/level_update.c index fe5d93dbf..a8262c835 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -251,7 +251,7 @@ u16 level_control_timer(s32 timerOp) { u32 pressed_pause(void) { if (gServerSettings.pauseAnywhere) { - if (get_dialog_id() < 0 && sCurrPlayMode == PLAY_MODE_NORMAL) { + if (get_dialog_id() < 0 && sCurrPlayMode == PLAY_MODE_NORMAL && sDelayedWarpOp == WARP_OP_NONE) { return gPlayer1Controller->buttonPressed & START_BUTTON; } } else { @@ -422,8 +422,6 @@ void init_mario_after_warp(void) { u32 marioSpawnType = get_mario_spawn_type(spawnNode->object); if (gMarioState && gMarioState->action != ACT_UNINITIALIZED) { - struct Object *obj = spawnNode->object; - printf("init mario x: %f, y: %f, z: %f\n", obj->oPosX, obj->oPosY, obj->oPosZ); for (s32 i = 0; i < MAX_PLAYERS; i++) { gPlayerSpawnInfos[i].startPos[0] = (s16) spawnNode->object->oPosX; gPlayerSpawnInfos[i].startPos[1] = (s16) spawnNode->object->oPosY;