SDL: fixed Four Score movie playback

This commit is contained in:
shinydoofy 2009-05-10 18:26:45 +00:00
parent 33d0a03b34
commit c7a24fe74f
2 changed files with 11 additions and 5 deletions

View File

@ -1,3 +1,4 @@
10-may-2009 - shinydoofy - sdl - fixed Four Score movie playback
02-may-2009 - adelikat - win32 - stop movie at frame x feature - fixed off by 1 error 02-may-2009 - adelikat - win32 - stop movie at frame x feature - fixed off by 1 error
23-apr-2009 - shinydoofy - sdl - added --ripsubs for converting fm2 movie subtitles to an srt file 23-apr-2009 - shinydoofy - sdl - added --ripsubs for converting fm2 movie subtitles to an srt file
15-apr-2009 - shinydoofy - sdl - Lua is optional again, fixed the real issue 15-apr-2009 - shinydoofy - sdl - Lua is optional again, fixed the real issue

View File

@ -1005,11 +1005,16 @@ FCEUD_UpdateInput()
void FCEUD_SetInput(bool fourscore, ESI port0, ESI port1, ESIFC fcexp) void FCEUD_SetInput(bool fourscore, ESI port0, ESI port1, ESIFC fcexp)
{ {
eoptions &= ~EO_FOURSCORE; eoptions &= ~EO_FOURSCORE;
if(fourscore) eoptions |= EO_FOURSCORE; if(fourscore) { // Four Score emulation, only support gamepads, nothing else
eoptions |= EO_FOURSCORE;
InputType[0] = SI_GAMEPAD; // Controllers 1 and 3
InputType[1] = SI_GAMEPAD; // Controllers 2 and 4
InputType[2] = SIFC_NONE; // No extension
} else { // no Four Core emulation, check the config/movie file for controller types
InputType[0]=port0; InputType[0]=port0;
InputType[1]=port1; InputType[1]=port1;
InputType[2]=fcexp; InputType[2]=fcexp;
}
InitInputInterface(); InitInputInterface();
} }