From a022b04638604a86e06e5c6666497bf6f056e2e8 Mon Sep 17 00:00:00 2001 From: Agent X <44549182+Agent-11@users.noreply.github.com> Date: Tue, 19 Mar 2024 15:17:55 -0400 Subject: [PATCH] Some fixes --- data/dynos_gfx_init.cpp | 2 +- src/game/camera.c | 3 +-- src/pc/update_checker.c | 2 +- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/data/dynos_gfx_init.cpp b/data/dynos_gfx_init.cpp index be429349..c05943ee 100644 --- a/data/dynos_gfx_init.cpp +++ b/data/dynos_gfx_init.cpp @@ -59,7 +59,7 @@ static void ScanPacksFolder(SysPath _DynosPacksFolder) { // If pack folder exists, add it to the pack list SysPath _PackFolder = fstring("%s/%s", _DynosPacksFolder.c_str(), _DynosPacksEnt->d_name); if (fs_sys_dir_exists(_PackFolder.c_str())) { - if (gIsThreaded) { REFRESH_MUTEX(snprintf(gCurrLoadingSegment.str, 256, "Generating DynOS Pack:\n\\#808080\\%s", _PackFolder.c_str())); } + REFRESH_MUTEX(snprintf(gCurrLoadingSegment.str, 256, "Generating DynOS Pack:\n\\#808080\\%s", _PackFolder.c_str())); DynOS_Pack_Add(_PackFolder); DynOS_Actor_GeneratePack(_PackFolder); DynOS_Tex_GeneratePack(_PackFolder, _PackFolder, false); diff --git a/src/game/camera.c b/src/game/camera.c index 120d314b..d7a7046f 100644 --- a/src/game/camera.c +++ b/src/game/camera.c @@ -34,7 +34,6 @@ #include "pc/network/network.h" #include "pc/lua/smlua_hooks.h" #include "pc/djui/djui.h" -#include "pc/djui/djui_panel_player.h" #include "first_person_cam.h" #define CBUTTON_MASK (U_CBUTTONS | D_CBUTTONS | L_CBUTTONS | R_CBUTTONS) @@ -3661,7 +3660,7 @@ void zoom_out_if_paused_and_outside(struct GraphNodeCamera *camera) { areaMaskIndex = 0; areaBit = 0; } - if (gCameraMovementFlags & CAM_MOVE_PAUSE_SCREEN && !gDjuiPanelPlayerCreated) { + if (gCameraMovementFlags & CAM_MOVE_PAUSE_SCREEN && !gInPlayerMenu) { if (sFramesPaused >= 2) { if (sZoomOutAreaMasks[areaMaskIndex] & areaBit) { diff --git a/src/pc/update_checker.c b/src/pc/update_checker.c index 6938fc7a..52a9293f 100644 --- a/src/pc/update_checker.c +++ b/src/pc/update_checker.c @@ -115,7 +115,7 @@ void get_version_remote(void) { } void check_for_updates(void) { - if (gIsThreaded) { REFRESH_MUTEX(snprintf(gCurrLoadingSegment.str, 256, "Checking For Updates")); } + REFRESH_MUTEX(snprintf(gCurrLoadingSegment.str, 256, "Checking For Updates")); get_version_remote(); if (sRemoteVersion[0] != '\0' && strcmp(sRemoteVersion, get_version())) {