From bbcea298d70f804d8d96707c7066815156cff09a Mon Sep 17 00:00:00 2001
From: Maximilian Peters <maximili.peters@mail.huji.ac.il>
Date: Thu, 6 Jul 2017 01:06:31 +0200
Subject: [PATCH] Added support for Lua scripts via the command line

---
 BizHawk.Client.EmuHawk/MainForm.cs | 25 ++++++++++++++++++++++++-
 1 file changed, 24 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/MainForm.cs b/BizHawk.Client.EmuHawk/MainForm.cs
index d24ac003f5..16dbc35c3c 100644
--- a/BizHawk.Client.EmuHawk/MainForm.cs
+++ b/BizHawk.Client.EmuHawk/MainForm.cs
@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
@@ -160,6 +160,9 @@ namespace BizHawk.Client.EmuHawk
 			string cmdDumpType = null;
 			string cmdDumpName = null;
 			bool startFullscreen = false;
+			string luaScript = null;
+			bool luaConsole = false;
+
 			for (int i = 0; i < args.Length; i++)
 			{
 				// For some reason sometimes visual studio will pass this to us on the commandline. it makes no sense.
@@ -222,6 +225,15 @@ namespace BizHawk.Client.EmuHawk
 				{
 					startFullscreen = true;
 				}
+				else if (arg.StartsWith("--lua="))
+				{
+					luaScript = arg.Substring(arg.IndexOf('=') + 1);
+					luaConsole = true;
+				}
+				else if (arg.StartsWith("--luaconsole"))
+				{
+					luaConsole = true;
+				}
 				else
 				{
 					cmdRom = arg;
@@ -447,6 +459,17 @@ namespace BizHawk.Client.EmuHawk
 				}
 			}
 
+			//start Lua Console if requested in the command line arguments
+			if (luaConsole)
+			{
+				GlobalWin.Tools.Load<LuaConsole>();
+			}
+			//load Lua Script if requested in the command line arguments
+			if (luaScript != null)
+			{
+				GlobalWin.Tools.LuaConsole.LoadLuaFile(luaScript);
+			}
+
 			GlobalWin.Tools.AutoLoad();
 
 			if (Global.Config.RecentWatches.AutoLoad)