From ff45ad5f45b657e6c75836c891217f7cd5dd239a Mon Sep 17 00:00:00 2001 From: MysterD Date: Fri, 4 Sep 2020 21:27:06 -0700 Subject: [PATCH] Remove any lingering dialog boxes on level transition Fixes #22 --- src/game/level_update.c | 1 + src/pc/network/packets/packet_level_warp.c | 9 ++------- 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/src/game/level_update.c b/src/game/level_update.c index 37088b6e..7aa9f355 100644 --- a/src/game/level_update.c +++ b/src/game/level_update.c @@ -1198,6 +1198,7 @@ s32 update_level(void) { } s32 init_level(void) { + reset_dialog_render_state(); network_on_init_level(); s32 val4 = 0; diff --git a/src/pc/network/packets/packet_level_warp.c b/src/pc/network/packets/packet_level_warp.c index 37af017c..67d908c3 100644 --- a/src/pc/network/packets/packet_level_warp.c +++ b/src/pc/network/packets/packet_level_warp.c @@ -2,6 +2,7 @@ #include "../network.h" #include "src/game/level_update.h" #include "src/game/area.h" +#include "src/game/ingame_menu.h" #include "sm64.h" int matchCount = 0; @@ -18,13 +19,7 @@ void network_send_level_warp(void) { } static void force_well_behaved_state(void) { - /* - gDialogBoxState = DIALOG_STATE_OPENING; - gCourseDoneMenuTimer = 0; - gCourseCompleteCoins = 0; - gCourseCompleteCoinsEqual = 0; - gHudFlash = 0; - */ + reset_dialog_render_state(); level_set_transition(0, 0); gMenuMode = -1; gPauseScreenMode = 1;