From 79f7fba83cd5d564289f270feddc6d304ce1b1fa Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Tue, 13 Jan 2026 05:42:05 +0500 Subject: [PATCH] engine: client: make both UI and Render API to use same implementation of GetFilesList function --- engine/client/cl_gameui.c | 4 ++-- engine/client/cl_render.c | 26 +------------------------- engine/client/client.h | 1 + 3 files changed, 4 insertions(+), 27 deletions(-) diff --git a/engine/client/cl_gameui.c b/engine/client/cl_gameui.c index 3dd19d38..837a98cc 100644 --- a/engine/client/cl_gameui.c +++ b/engine/client/cl_gameui.c @@ -998,7 +998,7 @@ pfnGetFilesList release prev search on a next call ========= */ -static char ** GAME_EXPORT pfnGetFilesList( const char *pattern, int *numFiles, int gamedironly ) +char **GAME_EXPORT CL_GetFilesList( const char *pattern, int *numFiles, int gamedironly ) { static search_t *t = NULL; @@ -1238,7 +1238,7 @@ static const ui_enginefuncs_t gEngfuncs = pfnMemFree, pfnGetOldGameInfo, pfnGetGamesList, - pfnGetFilesList, + CL_GetFilesList, SV_GetSaveComment, CL_GetDemoComment, pfnCheckGameDll, diff --git a/engine/client/cl_render.c b/engine/client/cl_render.c index 356bbec6..aad0a2de 100644 --- a/engine/client/cl_render.c +++ b/engine/client/cl_render.c @@ -45,30 +45,6 @@ static void R_Mem_Free( void *mem, const char *filename, const int fileline ) _Mem_Free( mem, filename, fileline ); } -/* -========= -pfnGetFilesList - -========= -*/ -static char **pfnGetFilesList( const char *pattern, int *numFiles, int gamedironly ) -{ - static search_t *t = NULL; - - if( t ) Mem_Free( t ); // release prev search - - t = FS_Search( pattern, true, gamedironly ); - - if( !t ) - { - if( numFiles ) *numFiles = 0; - return NULL; - } - - if( numFiles ) *numFiles = t->numfilenames; - return t->filenames; -} - static uint pfnFileBufferCRC32( const void *buffer, const int length ) { uint modelCRC = 0; @@ -296,7 +272,7 @@ static render_api_t gRenderAPI = NULL, R_Mem_Alloc, R_Mem_Free, - pfnGetFilesList, + CL_GetFilesList, pfnFileBufferCRC32, pfnCompareFileTime, Host_Error, diff --git a/engine/client/client.h b/engine/client/client.h index 618f8061..c57603a8 100644 --- a/engine/client/client.h +++ b/engine/client/client.h @@ -1181,6 +1181,7 @@ void UI_ConnectionProgress_Precache( void ); void UI_ConnectionProgress_Connect( const char *server ); void UI_ConnectionProgress_ChangeLevel( void ); void UI_ConnectionProgress_ParseServerInfo( const char *server ); +char **GAME_EXPORT CL_GetFilesList( const char *pattern, int *numFiles, int gamedironly ); // used by both UI and Render APIs // // cl_mobile.c