From 3e2a215c15143bd007877b728cd84edc14f7c6cc Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Fri, 28 Apr 2023 04:40:19 +0300 Subject: [PATCH] engine: client: in_joy: rename -nojoy to -noenginejoy to avoid conflict with client.dll's joystick support --- engine/client/in_joy.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/engine/client/in_joy.c b/engine/client/in_joy.c index 1a3db099..e1932ad2 100644 --- a/engine/client/in_joy.c +++ b/engine/client/in_joy.c @@ -407,7 +407,9 @@ void Joy_Init( void ) joy_enable = Cvar_Get( "joy_enable", "1", FCVAR_ARCHIVE | FCVAR_FILTERABLE, "enable joystick" ); - if( Sys_CheckParm( "-nojoy" )) + // renamed from -nojoy to -noenginejoy to not conflict with + // client.dll's joystick support + if( Sys_CheckParm( "-noenginejoy" )) { Cvar_FullSet( "joy_enable", "0", FCVAR_READ_ONLY ); return;