1
0
Fork 0

make the used joystick selectable when 4axis is specified

Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2961
This commit is contained in:
Sebastian Strohhäcker 2007-08-12 10:23:36 +00:00
parent 703e78806c
commit 2ff695971f
2 changed files with 4 additions and 2 deletions

View file

@ -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
};

View file

@ -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 <string.h>
#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;