Hri7566
/
sm64coopdx
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Whoops

This commit is contained in:
Agent X 2024-07-19 20:10:38 -04:00
parent 948f2bfe23
commit c9f07a8efc
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/pc/controller/controller_sdl2.c
View File

@ -170,7 +170,7 @@ extern s16 gMenuMode;
static void controller_sdl_read(OSContPad *pad) { static void controller_sdl_read(OSContPad *pad) {
if (!init_ok) { return; } if (!init_ok) { return; }
if ((newcam_mouse == 1 || get_first_person_enabled() || gDjuiHudLockMouse) && !is_game_paused() && !gDjuiInMainMenu && !gDjuiChatBoxFocus && !gDjuiConsoleFocus && WAPI.has_focus()) { if ((newcam_mouse == 1 || get_first_person_enabled() || gDjuiHudLockMouse) && !is_game_paused() && !gDjuiPanelPauseCreated && !gDjuiInMainMenu && !gDjuiChatBoxFocus && !gDjuiConsoleFocus && WAPI.has_focus()) {
controller_mouse_enter_relative(); controller_mouse_enter_relative();
} else { } else {
controller_mouse_leave_relative(); controller_mouse_leave_relative();

3
src/pc/lua/utils/smlua_misc_utils.c
View File

@ -20,7 +20,6 @@
#include "pc/djui/djui_console.h" #include "pc/djui/djui_console.h"
#include "pc/djui/djui_hud_utils.h" #include "pc/djui/djui_hud_utils.h"
#include "pc/djui/djui_panel_playerlist.h" #include "pc/djui/djui_panel_playerlist.h"
#include "pc/djui/djui_panel_pause.h"
#include "game/skybox.h" #include "game/skybox.h"
#include "pc/gfx/gfx_pc.h" #include "pc/gfx/gfx_pc.h"
#include "include/course_table.h" #include "include/course_table.h"
@ -265,7 +264,7 @@ void hud_set_flash(s8 value) {
extern s16 gMenuMode; extern s16 gMenuMode;
bool is_game_paused(void) { bool is_game_paused(void) {
return gMenuMode != -1 || gDjuiPanelPauseCreated; return gMenuMode != -1;
} }
/// ///