valter/dosbox-staging
1
0
Fork 0
Code Releases Activity

Add patch 1094730 from Jon Niehof. Added a time out event for the joystick.(fixes detection in certain games).

Browse source 
Imported-from: https://svn.code.sf.net/p/dosbox/code-0/dosbox/trunk@2217
This commit is contained in:
Peter Veenstra 2005-06-13 14:48:02 +00:00
parent 82c4309af7
commit 5045f19259
4 changed files with 281 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/dosbox.cpp
View file

@ -16,7 +16,7 @@
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
*/
/* $Id: dosbox.cpp,v 1.84 2005-04-21 21:17:45 qbix79 Exp $ */
/* $Id: dosbox.cpp,v 1.85 2005-06-13 14:48:00 qbix79 Exp $ */
#include <stdlib.h>
#include <stdarg.h>
@ -260,7 +260,6 @@ void DOSBOX_Init(void) {
secprop->AddInitFunction(&DMA_Init);//done
secprop->AddInitFunction(&VGA_Init);
secprop->AddInitFunction(&KEYBOARD_Init);
secprop->AddInitFunction(&JOYSTICK_Init);//done
secprop=control->AddSection_prop("mixer",&MIXER_Init);
secprop->Add_bool("nosound",false);
@ -354,6 +353,14 @@ void DOSBOX_Init(void) {
secprop=control->AddSection_prop("bios",&BIOS_Init,false);//done
secprop->AddInitFunction(&INT10_Init);
secprop->AddInitFunction(&MOUSE_Init); //Must be after int10 as it uses CurMode
secprop->AddInitFunction(&JOYSTICK_Init);
secprop->Add_string("joysticktype","2axis");
MSG_Add("BIOS_CONFIGFILE_HELP",
"joysticktype -- Type of joystick to emulate: none, 2axis, 4axis,\n"
" fcs (Thrustmaster) ,ch (CH Flightstick).\n"
" none disables joystick emulation.\n"
" 2axis is the default and supports two joysticks.\n"
);
/* All the DOS Related stuff, which will eventually start up in the shell */
//TODO Maybe combine most of the dos stuff in one section like ems,xms