sm64-mirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2025-01-22 07:32:07 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Synchronize instructions in network_init (NT_SERVER) with network_receive_join (NT_CLIENT) (#597)

Browse source
This commit is contained in:
Radek Krzyśków 2024-12-31 16:28:52 +01:00 committed by GitHub
parent ab300a1844
commit 0ef9ae742e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 16 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2,7 +2,6 @@
#include "djui.h"
#include "djui_panel.h"
#include "djui_panel_menu.h"
#include "djui_panel_modlist.h"
#include "pc/network/network.h"
#include "pc/utils/misc.h"
#include "pc/configfile.h"
@ -29,11 +28,6 @@ void djui_panel_do_host(bool reconnecting, bool playSound) {
network_set_system(configNetworkSystem);
network_init(NT_SERVER, reconnecting);
djui_panel_modlist_create(NULL);
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; }

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

@ -11,6 +11,7 @@
#include "pc/configfile.h"
#include "pc/djui/djui.h"
#include "pc/djui/djui_panel.h"
#include "pc/djui/djui_panel_modlist.h"
#include "pc/djui/djui_hud_utils.h"
#include "pc/djui/djui_panel_main.h"
#include "pc/utils/misc.h"
@ -158,24 +159,26 @@ bool network_init(enum NetworkType inNetworkType, bool reconnecting) {
gNetworkType = inNetworkType;
if (gNetworkType == NT_SERVER) {
extern s16 gCurrSaveFileNum;
gCurrSaveFileNum = configHostSaveSlot;
mods_activate(&gLocalMods);
smlua_init();
dynos_behavior_hook_all_custom_behaviors();
network_player_connected(NPT_LOCAL, 0, configPlayerModel, &configPlayerPalette, configPlayerName, get_local_discord_id());
extern u8* gOverrideEeprom;
gOverrideEeprom = NULL;
if (gCurrLevelNum != (s16)gLevelValues.entryLevel) {
extern s16 gChangeLevelTransition;
gChangeLevelTransition = gLevelValues.entryLevel;
}
extern s16 gCurrSaveFileNum;
gCurrSaveFileNum = configHostSaveSlot;
network_player_connected(NPT_LOCAL, 0, configPlayerModel, &configPlayerPalette, configPlayerName, get_local_discord_id());
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();
extern s16 gChangeLevelTransition;
gChangeLevelTransition = gLevelValues.entryLevel;
}
configfile_save(configfile_name());

1
src/pc/network/packets/packet_join.c
View file

@ -15,7 +15,6 @@
#include "pc/djui/djui.h"
#include "pc/djui/djui_panel.h"
#include "pc/djui/djui_panel_modlist.h"
#include "pc/djui/djui_panel_playerlist.h"
#include "pc/djui/djui_panel_menu.h"
#include "pc/djui/djui_panel_join_message.h"
#include "pc/utils/string_builder.h"