From 2ff695971f7639689e379a72033b363983cf4893 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Strohh=C3=A4cker?= Date: Sun, 12 Aug 2007 10:23:36 +0000 Subject: [PATCH] make the used joystick selectable when 4axis is specified Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2961 --- include/joystick.h | 3 ++- src/hardware/joystick.cpp | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/include/joystick.h b/include/joystick.h index d590250f..7cd44494 100644 --- a/include/joystick.h +++ b/include/joystick.h @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: joystick.h,v 1.11 2007-02-22 08:44:06 qbix79 Exp $ */ +/* $Id: joystick.h,v 1.12 2007-08-12 10:23:35 c2woody Exp $ */ #ifndef DOSBOX_JOYSTICK_H #define DOSBOX_JOYSTICK_H void JOYSTICK_Enable(Bitu which,bool enabled); @@ -40,6 +40,7 @@ enum JoystickType { JOY_AUTO, JOY_2AXIS, JOY_4AXIS, + JOY_4AXIS_2, JOY_FCS, JOY_CH }; diff --git a/src/hardware/joystick.cpp b/src/hardware/joystick.cpp index 8f336607..f8fc6341 100644 --- a/src/hardware/joystick.cpp +++ b/src/hardware/joystick.cpp @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ -/* $Id: joystick.cpp,v 1.18 2007-02-22 08:44:07 qbix79 Exp $ */ +/* $Id: joystick.cpp,v 1.19 2007-08-12 10:23:36 c2woody Exp $ */ #include #include "dosbox.h" @@ -201,6 +201,7 @@ public: else if (!strcasecmp(type,"auto")) joytype = JOY_AUTO; else if (!strcasecmp(type,"2axis")) joytype = JOY_2AXIS; else if (!strcasecmp(type,"4axis")) joytype = JOY_4AXIS; + else if (!strcasecmp(type,"4axis_2")) joytype = JOY_4AXIS_2; else if (!strcasecmp(type,"fcs")) joytype = JOY_FCS; else if (!strcasecmp(type,"ch")) joytype = JOY_CH; else joytype = JOY_AUTO;