From e7e10ac8b9f2d630f93bb5e07225bfcaa7c636d2 Mon Sep 17 00:00:00 2001 From: Crow-bar Date: Sun, 10 Apr 2022 21:34:43 +0300 Subject: [PATCH] filesystem: hold mode fix --- engine/common/filesystem.c | 17 ++++++++--------- engine/common/soundlib/snd_mp3.c | 5 +++-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/engine/common/filesystem.c b/engine/common/filesystem.c index c38919a9..035733df 100644 --- a/engine/common/filesystem.c +++ b/engine/common/filesystem.c @@ -2387,19 +2387,13 @@ static file_t *FS_SysOpen( const char *filepath, const char *mode ) int mod, opt; uint ind; #if XASH_PSP +#ifdef XASH_REDUCE_FD qboolean backup_hold = false; - - // Hold file in open state - if( mode[0] == '*' ) - { - backup_hold = true; - mode++; - } - +#endif // Parse the mode string switch( mode[0] ) { - case 'r': // read + case 'r': // read mod = PSP_O_RDONLY; opt = 0; break; @@ -2428,6 +2422,11 @@ static file_t *FS_SysOpen( const char *filepath, const char *mode ) break; case 'b': // not used break; +#ifdef XASH_REDUCE_FD + case 'h': // hold + backup_hold = true; + break; +#endif default: break; } diff --git a/engine/common/soundlib/snd_mp3.c b/engine/common/soundlib/snd_mp3.c index 1f42bc32..a512bee7 100644 --- a/engine/common/soundlib/snd_mp3.c +++ b/engine/common/soundlib/snd_mp3.c @@ -117,8 +117,9 @@ stream_t *Stream_OpenMPG( const char *filename ) file_t *file; int ret; wavinfo_t sc; -#if XASH_PSP // hold mode - file = FS_Open( filename, "*rb", false ); +#if XASH_PSP + // h - hold mode + file = FS_Open( filename, "rbh", false ); #else file = FS_Open( filename, "rb", false ); #endif