From 0285667a71cb558ebab5aa9bae2934bb5872ea50 Mon Sep 17 00:00:00 2001
From: punkrockguy318 <punkrockguy318@users.sf.net>
Date: Sat, 2 Aug 2008 23:06:33 +0000
Subject: [PATCH] Preliminary lua support for sdl

---
 src/drivers/sdl/config.cpp |  5 ++++-
 src/drivers/sdl/sdl.cpp    | 12 +++++++++++-
 2 files changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/drivers/sdl/config.cpp b/src/drivers/sdl/config.cpp
index 73e7e63f..d563e76a 100644
--- a/src/drivers/sdl/config.cpp
+++ b/src/drivers/sdl/config.cpp
@@ -182,7 +182,10 @@ InitConfig()
     config->addOption('i', "inputcfg", "SDL.InputCfg", InputCfg);
     
     // video playback
-    config->addOption('z', "playmov", "SDL.Movie", "");
+    config->addOption("playmov", "SDL.Movie", "");
+    
+    // lua
+    config->addOption("loadlua", "SDL.LuaScript", "");
 
     // 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 ce2f4cf1..fd89be5d 100644
--- a/src/drivers/sdl/sdl.cpp
+++ b/src/drivers/sdl/sdl.cpp
@@ -19,6 +19,7 @@
 #include "../common/cheat.h"
 #include "../../fceu.h"
 #include "../../movie.h"
+#include "../../fceulua.h"
 
 #include "input.h"
 #include "dface.h"
@@ -93,7 +94,8 @@ char *DriverUsage=
 --pass s, -w s	Sets password to use for connecting to the server.\n\
 --netkey s, -k s	Uses key 's' to create a unique session for the game loaded.\n\
 --players x, -l x	Sets the number of local players.\n\
---playmov f    Plays back a recorded movie from filename f.\n";
+--playmov f    Plays back a recorded movie from filename f.\n\
+--loadlua f    Loads lua script from filename f\n";
 
 
 // global configuration object
@@ -522,6 +524,14 @@ main(int argc,
         FCEUI_LoadMovie((char*)fname.c_str(), false, false, false);
         g_config->setOption("SDL.Movie", "");
     }
+    
+    // load lua script if option passed
+    g_config->getOption("SDL.LuaScript", &fname);
+    if (fname != "")
+    {
+        FCEU_LoadLuaCode(fname.c_str());
+        g_config->setOption("SDL.LoadLua", "");
+    }
 
     // loop playing the game
     while(GameInfo) {