From c7a24fe74f4c3cb4f4f9af5431391143e92e963f Mon Sep 17 00:00:00 2001
From: shinydoofy <shinydoofy@users.sf.net>
Date: Sun, 10 May 2009 18:26:45 +0000
Subject: [PATCH] SDL: fixed Four Score movie playback

---
 changelog.txt             |  1 +
 src/drivers/sdl/input.cpp | 15 ++++++++++-----
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/changelog.txt b/changelog.txt
index 12521f5b..283e1172 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -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
 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
diff --git a/src/drivers/sdl/input.cpp b/src/drivers/sdl/input.cpp
index a1e80118..46a3d58c 100644
--- a/src/drivers/sdl/input.cpp
+++ b/src/drivers/sdl/input.cpp
@@ -1005,11 +1005,16 @@ FCEUD_UpdateInput()
 void FCEUD_SetInput(bool fourscore, ESI port0, ESI port1, ESIFC fcexp)
 {
 	eoptions &= ~EO_FOURSCORE;
-	if(fourscore) eoptions |= EO_FOURSCORE;
-
-	InputType[0]=port0;
-	InputType[1]=port1;
-	InputType[2]=fcexp;
+	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[1]=port1;
+		InputType[2]=fcexp;
+	}
 	InitInputInterface();
 }