YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-01-17 18:40:02 +00:00
Code Issues Projects Releases Wiki Activity

remove platform-specific macros

Browse Source
This commit is contained in:
Velaron 2020-08-24 19:45:28 +03:00 committed by Alibek Omarov
parent d015e97eae
commit 09ae961221
2 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
engine/client/cl_game.c
View File

@ -3957,7 +3957,7 @@ qboolean CL_LoadProgs( const char *name )
#else #else
// this doesn't mean other platforms uses SDL2 in any case // this doesn't mean other platforms uses SDL2 in any case
// it just helps input code to stay platform-independent // it just helps input code to stay platform-independent
clgame.client_dll_uses_sdl = true; clgame.client_dll_uses_sdl = false;
#endif #endif
clgame.hInstance = COM_LoadLibrary( name, false, false ); clgame.hInstance = COM_LoadLibrary( name, false, false );

14
engine/client/input.c
View File

@ -46,10 +46,7 @@ convar_t *cl_forwardspeed;
convar_t *cl_sidespeed; convar_t *cl_sidespeed;
convar_t *cl_backspeed; convar_t *cl_backspeed;
convar_t *look_filter; convar_t *look_filter;
#if XASH_WIN32
convar_t *m_rawinput; convar_t *m_rawinput;
#endif
/* /*
================ ================
@ -121,10 +118,7 @@ void IN_StartupMouse( void )
m_pitch = Cvar_Get( "m_pitch", "0.022", FCVAR_ARCHIVE, "mouse pitch value" ); m_pitch = Cvar_Get( "m_pitch", "0.022", FCVAR_ARCHIVE, "mouse pitch value" );
m_yaw = Cvar_Get( "m_yaw", "0.022", FCVAR_ARCHIVE, "mouse yaw value" ); m_yaw = Cvar_Get( "m_yaw", "0.022", FCVAR_ARCHIVE, "mouse yaw value" );
look_filter = Cvar_Get( "look_filter", "0", FCVAR_ARCHIVE, "filter look events making it smoother" ); look_filter = Cvar_Get( "look_filter", "0", FCVAR_ARCHIVE, "filter look events making it smoother" );
#if XASH_WIN32
m_rawinput = Cvar_Get( "m_rawinput", "1", FCVAR_ARCHIVE, "enable mouse raw input" ); m_rawinput = Cvar_Get( "m_rawinput", "1", FCVAR_ARCHIVE, "enable mouse raw input" );
#endif
// You can use -nomouse argument to prevent using mouse from client // You can use -nomouse argument to prevent using mouse from client
// -noenginemouse will disable all mouse input // -noenginemouse will disable all mouse input
@ -215,11 +209,7 @@ void IN_ToggleClientMouse( int newstate, int oldstate )
#if XASH_SDL #if XASH_SDL
SDL_SetWindowGrab( host.hWnd, SDL_TRUE ); SDL_SetWindowGrab( host.hWnd, SDL_TRUE );
#if SDL_VERSION_ATLEAST( 2, 0, 0 ) #if SDL_VERSION_ATLEAST( 2, 0, 0 )
#if XASH_WIN32
if ( clgame.dllFuncs.pfnLookEvent || ( clgame.client_dll_uses_sdl && CVAR_TO_BOOL( m_rawinput ) ) ) if ( clgame.dllFuncs.pfnLookEvent || ( clgame.client_dll_uses_sdl && CVAR_TO_BOOL( m_rawinput ) ) )
#else
if ( clgame.dllFuncs.pfnLookEvent )
#endif // XASH_WIN32
{ {
SDL_SetRelativeMouseMode( SDL_TRUE ); SDL_SetRelativeMouseMode( SDL_TRUE );
} }
@ -235,11 +225,7 @@ void IN_ToggleClientMouse( int newstate, int oldstate )
#ifdef XASH_SDL #ifdef XASH_SDL
SDL_SetWindowGrab(host.hWnd, SDL_FALSE); SDL_SetWindowGrab(host.hWnd, SDL_FALSE);
#if SDL_VERSION_ATLEAST( 2, 0, 0 ) #if SDL_VERSION_ATLEAST( 2, 0, 0 )
#if XASH_WIN32
if ( clgame.dllFuncs.pfnLookEvent || ( clgame.client_dll_uses_sdl && CVAR_TO_BOOL( m_rawinput ) ) ) if ( clgame.dllFuncs.pfnLookEvent || ( clgame.client_dll_uses_sdl && CVAR_TO_BOOL( m_rawinput ) ) )
#else
if ( clgame.dllFuncs.pfnLookEvent )
#endif // XASH_WIN32
{ {
SDL_SetRelativeMouseMode( SDL_FALSE ); SDL_SetRelativeMouseMode( SDL_FALSE );
} }