thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-10-30 08:01:01 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Fix gLevelValues.entryLevel"

Browse source 
This reverts commit 12bf74eb32.
This commit is contained in:
Agent X 2024-12-31 20:12:03 -05:00
parent bc55b1c654
commit 66fbbc819d
2 changed files with 4 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/pc/djui/djui_panel_host_message.c
View file

@ -28,10 +28,6 @@ void djui_panel_do_host(bool reconnecting, bool playSound) {
network_set_system(configNetworkSystem); network_set_system(configNetworkSystem);
network_init(NT_SERVER, reconnecting); 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 (gMarioState->marioObj) vec3f_copy(gMarioState->marioObj->header.gfx.cameraToObject, gGlobalSoundSource);
if (playSound) { gDelayedInitSound = CHAR_SOUND_OKEY_DOKEY; } if (playSound) { gDelayedInitSound = CHAR_SOUND_OKEY_DOKEY; }

4
src/pc/network/network.c
View file

@ -170,16 +170,16 @@ bool network_init(enum NetworkType inNetworkType, bool reconnecting) {
djui_chat_box_create(); djui_chat_box_create();
djui_panel_shutdown(); djui_panel_shutdown();
fake_lvl_init_from_save_file();
mods_activate(&gLocalMods); mods_activate(&gLocalMods);
djui_panel_modlist_create(NULL); djui_panel_modlist_create(NULL);
smlua_init(); smlua_init();
dynos_behavior_hook_all_custom_behaviors(); dynos_behavior_hook_all_custom_behaviors();
if (gCurrLevelNum != (s16)gLevelValues.entryLevel) {
extern s16 gChangeLevelTransition; extern s16 gChangeLevelTransition;
gChangeLevelTransition = gLevelValues.entryLevel; gChangeLevelTransition = gLevelValues.entryLevel;
} }
}
configfile_save(configfile_name()); configfile_save(configfile_name());