From 25f46bbf525e4008ac00861e9d86024bf9be1bc5 Mon Sep 17 00:00:00 2001 From: Simon Date: Fri, 10 Mar 2023 17:54:58 +0000 Subject: [PATCH] @MuadDib: Fix-detection-of-expanded-menu-mod --- Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp | 2 +- Projects/Android/jni/OpenJK/code/qcommon/files.cpp | 5 +++++ Projects/Android/jni/OpenJK/code/qcommon/qcommon.h | 1 + 3 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp b/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp index 60a16c0..5fcb80e 100644 --- a/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp +++ b/Projects/Android/jni/JKXR/JKXR_SurfaceView.cpp @@ -305,7 +305,7 @@ void VR_Init() vr_use_gesture_boundary = Cvar_Get ("vr_use_gesture_boundary", "0.35", CVAR_ARCHIVE); cvar_t *expanded_menu_enabled = Cvar_Get ("expanded_menu_enabled", "0", CVAR_ARCHIVE); - if (FS_FileExists("expanded_menu.pk3")) { + if (FS_FileExists("expanded_menu.pk3") || FS_BaseFileExists("expanded_menu.pk3")) { Cvar_Set( "expanded_menu_enabled", "1" ); } else { Cvar_Set( "expanded_menu_enabled", "0" ); diff --git a/Projects/Android/jni/OpenJK/code/qcommon/files.cpp b/Projects/Android/jni/OpenJK/code/qcommon/files.cpp index c35d0e0..d0ee149 100644 --- a/Projects/Android/jni/OpenJK/code/qcommon/files.cpp +++ b/Projects/Android/jni/OpenJK/code/qcommon/files.cpp @@ -751,6 +751,11 @@ qboolean FS_FileExists( const char *file ) return FS_FileInPathExists(FS_BuildOSPath(fs_homepath->string, fs_gamedir, file)); } +qboolean FS_BaseFileExists( const char *file ) +{ + return FS_FileInPathExists(FS_BuildOSPath(fs_homepath->string, BASEGAME, file)); +} + /* ================ FS_SV_FileExists diff --git a/Projects/Android/jni/OpenJK/code/qcommon/qcommon.h b/Projects/Android/jni/OpenJK/code/qcommon/qcommon.h index 70580da..88a9846 100644 --- a/Projects/Android/jni/OpenJK/code/qcommon/qcommon.h +++ b/Projects/Android/jni/OpenJK/code/qcommon/qcommon.h @@ -464,6 +464,7 @@ void FS_Rmdir( const char *osPath, qboolean recursive ); void FS_HomeRmdir( const char *homePath, qboolean recursive ); qboolean FS_FileExists( const char *file ); +qboolean FS_BaseFileExists( const char *file ); char *FS_BuildOSPath( const char *base, const char *game, const char *qpath );