joystick_init() is now called after loading the configuration file - makes the emulator not load the joystick at all if joystick_type is set to 7 (No Joystick).
This commit is contained in:
3
src/pc.c
3
src/pc.c
@@ -240,7 +240,6 @@ void initpc(int argc, char *argv[])
|
|||||||
|
|
||||||
keyboard_init();
|
keyboard_init();
|
||||||
mouse_init();
|
mouse_init();
|
||||||
joystick_init();
|
|
||||||
midi_init();
|
midi_init();
|
||||||
|
|
||||||
if (config_file == NULL)
|
if (config_file == NULL)
|
||||||
@@ -257,6 +256,8 @@ void initpc(int argc, char *argv[])
|
|||||||
if (config_file)
|
if (config_file)
|
||||||
saveconfig();
|
saveconfig();
|
||||||
|
|
||||||
|
joystick_init();
|
||||||
|
|
||||||
cpuspeed2=(AT)?2:1;
|
cpuspeed2=(AT)?2:1;
|
||||||
// cpuspeed2=cpuspeed;
|
// cpuspeed2=cpuspeed;
|
||||||
atfullspeed=0;
|
atfullspeed=0;
|
||||||
|
Reference in New Issue
Block a user