From b0a2d52771105bf65197bd269c11c28ce3f1ad5a Mon Sep 17 00:00:00 2001 From: hnt_ts Date: Sat, 31 May 2008 13:18:02 +0000 Subject: [PATCH] Fixed this problem: http://duke3d.bur.st/forum/index.php?topic=8.msg1938#msg1938. Also it was impossible to assign "no action" to the left mouse button. git-svn-id: https://svn.eduke32.com/eduke32@752 1a8010ca-5511-0410-912e-c29ae57300e0 --- polymer/eduke32/source/config.c | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/polymer/eduke32/source/config.c b/polymer/eduke32/source/config.c index 457f401c8..4375b9669 100644 --- a/polymer/eduke32/source/config.c +++ b/polymer/eduke32/source/config.c @@ -400,14 +400,12 @@ void CONFIG_SetupMouse(void) Bsprintf(str,"MouseButton%d",i); temp[0] = 0; if (!SCRIPT_GetString(ud.config.scripthandle,"Controls", str,temp)) - if (CONFIG_FunctionNameToNum(temp) != -1 || (!temp[0] && CONFIG_FunctionNameToNum(temp) != -1)) - ud.config.MouseFunctions[i][0] = CONFIG_FunctionNameToNum(temp); + ud.config.MouseFunctions[i][0] = CONFIG_FunctionNameToNum(temp); Bsprintf(str,"MouseButtonClicked%d",i); temp[0] = 0; if (!SCRIPT_GetString(ud.config.scripthandle,"Controls", str,temp)) - if (CONFIG_FunctionNameToNum(temp) != -1 || (!temp[0] && CONFIG_FunctionNameToNum(temp) != -1)) - ud.config.MouseFunctions[i][1] = CONFIG_FunctionNameToNum(temp); + ud.config.MouseFunctions[i][1] = CONFIG_FunctionNameToNum(temp); } // map over the axes @@ -477,14 +475,12 @@ void CONFIG_SetupJoystick(void) Bsprintf(str,"JoystickButton%d",i); temp[0] = 0; if (!SCRIPT_GetString(ud.config.scripthandle,"Controls", str,temp)) - if (CONFIG_FunctionNameToNum(temp) != -1 || (!temp[0] && CONFIG_FunctionNameToNum(temp) != -1)) - ud.config.JoystickFunctions[i][0] = CONFIG_FunctionNameToNum(temp); + ud.config.JoystickFunctions[i][0] = CONFIG_FunctionNameToNum(temp); Bsprintf(str,"JoystickButtonClicked%d",i); temp[0] = 0; if (!SCRIPT_GetString(ud.config.scripthandle,"Controls", str,temp)) - if (CONFIG_FunctionNameToNum(temp) != -1 || (!temp[0] && CONFIG_FunctionNameToNum(temp) != -1)) - ud.config.JoystickFunctions[i][1] = CONFIG_FunctionNameToNum(temp); + ud.config.JoystickFunctions[i][1] = CONFIG_FunctionNameToNum(temp); } // map over the axes