thirdpartymirrors/sm64coopdx
1
0
Fork 0
mirror of https://github.com/coop-deluxe/sm64coopdx.git synced 2026-04-28 04:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Small bug fixes to Stop Hosting (#161)

Browse source 
Previously you could exit during the act select screen and even crash the game by entering a door and then pressing Stop Host.
This commit is contained in:
Agent X 2022-08-25 20:33:47 -04:00 • committed by GitHub
parent 7e1110cde9
commit 01035c895a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/level_update.c
View file

@ -20,7 +20,7 @@
#include "object_list_processor.h" #include "object_list_processor.h"
#include "ingame_menu.h" #include "ingame_menu.h"
#include "obj_behaviors.h" #include "obj_behaviors.h"
#include "game/object_helpers.h" #include "object_helpers.h"
#include "save_file.h" #include "save_file.h"
#include "hardcoded.h" #include "hardcoded.h"
#include "debug_course.h" #include "debug_course.h"

9
src/pc/djui/djui_panel_pause.c
View file

@ -1,7 +1,10 @@
#include "djui.h" #include "djui.h"
#include "pc/cheats.h" #include "pc/cheats.h"
#include "src/pc/pc_main.h" #include "pc/pc_main.h"
#include "src/pc/network/network.h" #include "pc/network/network.h"
#include "game/object_helpers.h"
#include "behavior_table.h"
#include "sm64.h"
bool gDjuiPanelPauseCreated = false; bool gDjuiPanelPauseCreated = false;
@ -14,6 +17,8 @@ static void djui_panel_pause_quit_yes(UNUSED struct DjuiBase* caller) {
} }
static void djui_panel_pause_quit(struct DjuiBase* caller) { static void djui_panel_pause_quit(struct DjuiBase* caller) {
if (find_object_with_behavior(bhvActSelector) != NULL || gMarioStates[0].action == ACT_PUSHING_DOOR || gMarioStates[0].action == ACT_PULLING_DOOR) { return; }
if (gNetworkType == NT_SERVER) { if (gNetworkType == NT_SERVER) {
djui_panel_confirm_create(caller, djui_panel_confirm_create(caller,
"\\#ff0800\\Q\\#1be700\\U\\#00b3ff\\I\\#ffef00\\T", "\\#ff0800\\Q\\#1be700\\U\\#00b3ff\\I\\#ffef00\\T",