From a26194a089774a1425def9a211be0f0153140690 Mon Sep 17 00:00:00 2001
From: punkrockguy318 <punkrockguy318@users.sf.net>
Date: Wed, 24 Sep 2008 06:27:28 +0000
Subject: [PATCH] --newppu option added to sdl

---
 SConstruct                 |  3 ++-
 changelog.txt              |  2 ++
 src/drivers/sdl/config.cpp |  3 +++
 src/drivers/sdl/sdl.cpp    | 12 ++++++++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/SConstruct b/SConstruct
index 31c4b812..a8fc387d 100644
--- a/SConstruct
+++ b/SConstruct
@@ -6,7 +6,8 @@ opts.AddOptions(
   BoolOption('FRAMESKIP', 'Enable frameskipping', 1),
   BoolOption('OPENGL',    'Enable OpenGL support', 1),
   BoolOption('DEBUG',     'Build with debugging symbols', 0),
-  BoolOption('LUA',       'Enable Lua support', 1)
+  BoolOption('LUA',       'Enable Lua support', 1),
+  BoolOption('NEWPPU',    'Enable new PPU core', 0)
 )
 
 env = Environment(options = opts)
diff --git a/changelog.txt b/changelog.txt
index 1baeea0e..84b65eb8 100644
--- a/changelog.txt
+++ b/changelog.txt
@@ -1,4 +1,6 @@
 ---version 2.0.3 yet to be released---
+24-sep-2008 - punkrockguy318 - [ 2057006 ] --newppu option added to sdl,
+disabled by default
 24-sep-2008 - punkrockguy318 - [ 2057008 ] lua is now optional, thanks
 shinydoofy for a patch.  also fixed some build issues.
 22-sep-2008 - punkrockguy318 - [ 2008437 ] fixed an issue where flawed movie
diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp
index 3c0ce6e7..41941be7 100644
--- a/src/drivers/sdl/config.cpp
+++ b/src/drivers/sdl/config.cpp
@@ -185,6 +185,9 @@ InitConfig()
     // load lua script
     config->addOption("loadlua", "SDL.LuaScript", "");
     #endif
+	
+	// enable new PPU core
+	config->addOption("newppu", "SDL.NewPPU", "0");
 
     // GamePad 0 - 3
     for(unsigned int i = 0; i < GAMEPAD_NUM_DEVICES; i++) {
diff --git a/src/drivers/sdl/sdl.cpp b/src/drivers/sdl/sdl.cpp
index 6dea1874..94ed86dc 100644
--- a/src/drivers/sdl/sdl.cpp
+++ b/src/drivers/sdl/sdl.cpp
@@ -54,6 +54,7 @@ char *DriverUsage="\
 --pal          {0|1}   Uses PAL timing.\n\
 --gamegenie    {0|1}   Enables emulated Game Genie.\n\
 --nospritelim  {0|1}   Disables the 8 sprites per scanline limitation.\n\
+--newppu       {0|1}   Enables the new PPU core.\n\
 --frameskip     x      Sets # of frames to skip per emulated frame.\n\
 --xres          x      Sets horizontal resolution to x for full screen mode.\n\
 --yres          x      Sets vertical resolution to x for full screen mode.\n\
@@ -496,6 +497,17 @@ SDL_GL_LoadLibrary(0);
     }
 	#endif
 	
+	g_config->getOption("SDL.NewPPU", &fname);
+	if (fname == "1")
+		newppu = 1;
+	/*g_config->setOption("SDL.LuaScript", "");
+    if (fname != "")
+    {
+        FCEU_LoadLuaCode(fname.c_str());
+    }*/
+	
+	
+	
     // loop playing the game
     while(GameInfo) {
         DoFun(frameskip);