vilyaem/Xrasher
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

engine: client: leave SDL2 client.dll detection for Windows only

Browse source
This commit is contained in:
Alibek Omarov 2024-12-24 10:46:39 +03:00
parent cfebee6ea8
commit 74c19a1557
2 changed files with 6 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
engine/client/cl_game.c
View file

@ -4019,36 +4019,19 @@ qboolean CL_LoadProgs( const char *name )
clgame.mempool = Mem_AllocPool( "Client Edicts Zone" ); clgame.mempool = Mem_AllocPool( "Client Edicts Zone" );
clgame.entities = NULL; clgame.entities = NULL;
// a1ba: we need to check if client.dll has direct dependency on SDL2 // a1ba: we need to check if client.dll has direct dependency on SDL2
// and if so, disable relative mouse mode // and if so, disable relative mouse mode
#if XASH_WIN32 && !XASH_64BIT #if XASH_WIN32 && !XASH_64BIT
if( ( clgame.client_dll_uses_sdl = COM_CheckLibraryDirectDependency( name, OS_LIB_PREFIX "SDL2." OS_LIB_EXT, false ) ) ) clgame.client_dll_uses_sdl = COM_CheckLibraryDirectDependency( name, OS_LIB_PREFIX "SDL2." OS_LIB_EXT, false );
{ Con_Printf( S_NOTE "%s uses %s for mouse input\n", name, clgame.client_dll_uses_sdl ? "SDL2" : "Windows API" );
Con_Printf( S_NOTE "%s uses SDL2 for mouse input\n", name );
}
else
{
Con_Printf( S_NOTE "%s uses Windows API for mouse input\n", name );
}
#else
// this doesn't mean other platforms uses SDL2 in any case
// it just helps input code to stay platform-independent
clgame.client_dll_uses_sdl = true;
#endif #endif
// NOTE: important stuff! // NOTE: important stuff!
// vgui must startup BEFORE loading client.dll to avoid get error ERROR_NOACESS // vgui must startup BEFORE loading client.dll to avoid get error ERROR_NOACESS during LoadLibrary
// during LoadLibrary
if( !GI->internal_vgui_support && VGui_LoadProgs( NULL )) if( !GI->internal_vgui_support && VGui_LoadProgs( NULL ))
{
VGui_Startup( refState.width, refState.height ); VGui_Startup( refState.width, refState.height );
}
else else
{ GI->internal_vgui_support = true; // we failed to load vgui_support, but let's probe client.dll for support anyway
// we failed to load vgui_support, but let's probe client.dll for support anyway
GI->internal_vgui_support = true;
}
clgame.hInstance = COM_LoadLibrary( name, false, false ); clgame.hInstance = COM_LoadLibrary( name, false, false );
@ -4057,9 +4040,7 @@ qboolean CL_LoadProgs( const char *name )
// delayed vgui initialization for internal support // delayed vgui initialization for internal support
if( GI->internal_vgui_support && VGui_LoadProgs( clgame.hInstance )) if( GI->internal_vgui_support && VGui_LoadProgs( clgame.hInstance ))
{
VGui_Startup( refState.width, refState.height ); VGui_Startup( refState.width, refState.height );
}
// clear exports // clear exports
ClearExports( cdll_exports, ARRAYSIZE( cdll_exports )); ClearExports( cdll_exports, ARRAYSIZE( cdll_exports ));

2
engine/client/client.h
View file

@ -495,7 +495,9 @@ typedef struct
cl_entity_t viewent; // viewmodel cl_entity_t viewent; // viewmodel
#if XASH_WIN32
qboolean client_dll_uses_sdl; qboolean client_dll_uses_sdl;
#endif
} clgame_static_t; } clgame_static_t;
typedef struct typedef struct