From 66fbbc819d95b7e584328b3d22c921f42987422e Mon Sep 17 00:00:00 2001 From: Agent X <44549182+AgentXLP@users.noreply.github.com> Date: Tue, 31 Dec 2024 20:12:03 -0500 Subject: [PATCH] Revert "Fix gLevelValues.entryLevel" This reverts commit 12bf74eb32456ac5498fd9e191fc127e1b11d664. --- src/pc/djui/djui_panel_host_message.c | 4 ---- src/pc/network/network.c | 8 ++++---- 2 files changed, 4 insertions(+), 8 deletions(-) diff --git a/src/pc/djui/djui_panel_host_message.c b/src/pc/djui/djui_panel_host_message.c index 325606f50..092bb68b0 100644 --- a/src/pc/djui/djui_panel_host_message.c +++ b/src/pc/djui/djui_panel_host_message.c @@ -28,10 +28,6 @@ void djui_panel_do_host(bool reconnecting, bool playSound) { network_set_system(configNetworkSystem); network_init(NT_SERVER, reconnecting); - fake_lvl_init_from_save_file(); - - extern s16 gChangeLevelTransition; - gChangeLevelTransition = gLevelValues.entryLevel; if (gMarioState->marioObj) vec3f_copy(gMarioState->marioObj->header.gfx.cameraToObject, gGlobalSoundSource); if (playSound) { gDelayedInitSound = CHAR_SOUND_OKEY_DOKEY; } diff --git a/src/pc/network/network.c b/src/pc/network/network.c index a0245fe10..bad063917 100644 --- a/src/pc/network/network.c +++ b/src/pc/network/network.c @@ -170,15 +170,15 @@ bool network_init(enum NetworkType inNetworkType, bool reconnecting) { djui_chat_box_create(); djui_panel_shutdown(); + fake_lvl_init_from_save_file(); + mods_activate(&gLocalMods); djui_panel_modlist_create(NULL); smlua_init(); dynos_behavior_hook_all_custom_behaviors(); - if (gCurrLevelNum != (s16)gLevelValues.entryLevel) { - extern s16 gChangeLevelTransition; - gChangeLevelTransition = gLevelValues.entryLevel; - } + extern s16 gChangeLevelTransition; + gChangeLevelTransition = gLevelValues.entryLevel; } configfile_save(configfile_name());