Some fixes

This commit is contained in:
Agent X 2024-03-19 15:17:55 -04:00
parent 680d40be60
commit a022b04638
3 changed files with 3 additions and 4 deletions

View File

@ -59,7 +59,7 @@ static void ScanPacksFolder(SysPath _DynosPacksFolder) {
// If pack folder exists, add it to the pack list // If pack folder exists, add it to the pack list
SysPath _PackFolder = fstring("%s/%s", _DynosPacksFolder.c_str(), _DynosPacksEnt->d_name); SysPath _PackFolder = fstring("%s/%s", _DynosPacksFolder.c_str(), _DynosPacksEnt->d_name);
if (fs_sys_dir_exists(_PackFolder.c_str())) { 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_Pack_Add(_PackFolder);
DynOS_Actor_GeneratePack(_PackFolder); DynOS_Actor_GeneratePack(_PackFolder);
DynOS_Tex_GeneratePack(_PackFolder, _PackFolder, false); DynOS_Tex_GeneratePack(_PackFolder, _PackFolder, false);

View File

@ -34,7 +34,6 @@
#include "pc/network/network.h" #include "pc/network/network.h"
#include "pc/lua/smlua_hooks.h" #include "pc/lua/smlua_hooks.h"
#include "pc/djui/djui.h" #include "pc/djui/djui.h"
#include "pc/djui/djui_panel_player.h"
#include "first_person_cam.h" #include "first_person_cam.h"
#define CBUTTON_MASK (U_CBUTTONS | D_CBUTTONS | L_CBUTTONS | R_CBUTTONS) #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; areaMaskIndex = 0;
areaBit = 0; areaBit = 0;
} }
if (gCameraMovementFlags & CAM_MOVE_PAUSE_SCREEN && !gDjuiPanelPlayerCreated) { if (gCameraMovementFlags & CAM_MOVE_PAUSE_SCREEN && !gInPlayerMenu) {
if (sFramesPaused >= 2) { if (sFramesPaused >= 2) {
if (sZoomOutAreaMasks[areaMaskIndex] & areaBit) { if (sZoomOutAreaMasks[areaMaskIndex] & areaBit) {

View File

@ -115,7 +115,7 @@ void get_version_remote(void) {
} }
void check_for_updates(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(); get_version_remote();
if (sRemoteVersion[0] != '\0' && strcmp(sRemoteVersion, get_version())) { if (sRemoteVersion[0] != '\0' && strcmp(sRemoteVersion, get_version())) {