From 2147542e33e96a31b53afac57346cc035270c1a3 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Sun, 27 Jun 2021 00:20:23 +0300 Subject: [PATCH] engine: all user libraries packed inside archives are now deprecated --- engine/common/filesystem.c | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/engine/common/filesystem.c b/engine/common/filesystem.c index f6902a85..39a50d9c 100644 --- a/engine/common/filesystem.c +++ b/engine/common/filesystem.c @@ -3347,11 +3347,23 @@ dll_user_t *FS_FindLibrary( const char *dllname, qboolean directpath ) { // NOTE: if search is NULL let the OS found library himself Q_strncpy( hInst->fullPath, dllpath, sizeof( hInst->fullPath )); + + if( search && ( search->wad || search->pack || search->zip ) ) + { #if XASH_WIN32 && XASH_X86 // a1ba: custom loader is non-portable (I just don't want to touch it) - hInst->custom_loader = (search) ? true : false; + Con_Printf( S_WARN "%s: loading libraries from packs is deprecated " + "and will be removed in the future\n", __FUNCTION__ ); + hInst->custom_loader = true; #else - hInst->custom_loader = false; + Con_Printf( S_WARN "%s: loading libraries from packs is unsupported on " + "this platform\n", __FUNCTION__ ); + hInst->custom_loader = false; #endif + } + else + { + hInst->custom_loader = true; + } } fs_ext_path = false; // always reset direct paths