From 8586ec1e408e0163209773f9519f76d0b21dfd87 Mon Sep 17 00:00:00 2001
From: zeromus <zeromus@users.sf.net>
Date: Tue, 29 Dec 2009 07:03:57 +0000
Subject: [PATCH] sdl: fix link error related to use of variable turbo in
 movie.cpp, and add --fourscore for fourscore emulation (since the way this is
 submitted to the core emulator changed within the past year and sdl's method
 was out of date)

---
 src/drivers/sdl/config.cpp | 2 ++
 src/drivers/sdl/sdl.cpp    | 9 +++++++++
 2 files changed, 11 insertions(+)

diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp
index e5ee27a8..60a52486 100644
--- a/src/drivers/sdl/config.cpp
+++ b/src/drivers/sdl/config.cpp
@@ -195,6 +195,8 @@ InitConfig()
     // video playback
     config->addOption("playmov", "SDL.Movie", "");
     config->addOption("subtitles", "SDL.SubtitleDisplay", 1);
+	
+	config->addOption("fourscore", "SDL.FourScore", 0);
     
     #ifdef _S9XLUA_H
     // load lua script
diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp
index ac7f6e83..472ffaec 100644
--- a/src/drivers/sdl/sdl.cpp
+++ b/src/drivers/sdl/sdl.cpp
@@ -54,6 +54,8 @@ extern double g_fpsScale;
 
 extern bool MaxSpeed;
 
+bool turbo = false;
+
 int CloseGame(void);
 
 static int inited=0;
@@ -103,6 +105,7 @@ char *DriverUsage="\
 --fcmconvert    f      Converts fcm movie file f to fm2.\n\
 --ripsubs       f      Converts movie's subtitles to srt\n\
 --subtitles    {0,1}   Enables subtitle display\n\
+--fourscore    {0,1}   Enables fourscore emulation\n\
 --no-config    {0,1}   Don't change the config file";
 
 /* Moved network options out while netplay is broken.
@@ -276,6 +279,12 @@ DriverInitialize(FCEUGI *gi)
     if(InitJoysticks())
         inited|=2;
 
+	int fourscore=0;
+	g_config->getOption("SDL.FourScore", &fourscore);
+	eoptions &= ~EO_FOURSCORE;
+	if(fourscore)
+		eoptions |= EO_FOURSCORE;
+
     InitInputInterface();
     return 1;
 }