mirror of
https://github.com/coop-deluxe/sm64coopdx.git
synced 2024-11-29 07:23:01 +00:00
Prevent main menu player model from corrupting while joining
This commit is contained in:
parent
caf975a793
commit
0ce11ee2b1
3 changed files with 2 additions and 2 deletions
|
@ -29,6 +29,7 @@ void djui_init(void) {
|
||||||
|
|
||||||
void djui_connect_menu_open(void) {
|
void djui_connect_menu_open(void) {
|
||||||
djui_panel_shutdown();
|
djui_panel_shutdown();
|
||||||
|
gDjuiInMainMenu = true;
|
||||||
djui_panel_main_create(NULL);
|
djui_panel_main_create(NULL);
|
||||||
djui_panel_join_create(NULL);
|
djui_panel_join_create(NULL);
|
||||||
djui_panel_join_message_create(NULL);
|
djui_panel_join_message_create(NULL);
|
||||||
|
|
|
@ -86,8 +86,6 @@ bool network_init(enum NetworkType inNetworkType) {
|
||||||
gOverrideEeprom = NULL;
|
gOverrideEeprom = NULL;
|
||||||
|
|
||||||
djui_chat_box_create();
|
djui_chat_box_create();
|
||||||
} else if (gNetworkType == NT_CLIENT) {
|
|
||||||
network_player_connected(NPT_SERVER, 0, 0, 0, "Player");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
LOG_INFO("initialized");
|
LOG_INFO("initialized");
|
||||||
|
|
|
@ -3,6 +3,7 @@
|
||||||
#include "game/save_file.h"
|
#include "game/save_file.h"
|
||||||
|
|
||||||
void network_send_save_file(s32 fileIndex) {
|
void network_send_save_file(s32 fileIndex) {
|
||||||
|
if (gNetworkPlayerServer == NULL) { return; }
|
||||||
assert(gNetworkType == NT_CLIENT);
|
assert(gNetworkType == NT_CLIENT);
|
||||||
struct Packet p;
|
struct Packet p;
|
||||||
packet_init(&p, PACKET_SAVE_FILE, true, false);
|
packet_init(&p, PACKET_SAVE_FILE, true, false);
|
||||||
|
|
Loading…
Reference in a new issue