From 9d7c92fb6ea08ec27ab69fee0ed190bc842fd1e5 Mon Sep 17 00:00:00 2001
From: adelikat <adelikat@tasvideos.org>
Date: Tue, 29 Apr 2014 21:25:17 +0000
Subject: [PATCH] Oops

---
 .../Lua/Libraries/EmuLuaLibrary.Console.cs    | 19 +++++++++++++++++++
 .../tools/Lua/LuaConsole.cs                   |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
index 42a57e5dc2..3287438c76 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/Libraries/EmuLuaLibrary.Console.cs
@@ -88,6 +88,25 @@ namespace BizHawk.Client.EmuHawk
 			}
 		}
 
+		[LuaMethodAttributes(
+			"writeline",
+			"Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable"
+		)]
+		public static void WriteLine(params object[] outputs)
+		{
+			Log(outputs);
+			Log('\n');
+		}
+
+		[LuaMethodAttributes(
+			"write",
+			"Outputs the given object to the output box on the Lua Console dialog. Note: Can accept a LuaTable"
+		)]
+		public static void Write(params object[] outputs)
+		{
+			Log(outputs);
+		}
+
 		// Single param version is used by logOutputCallback of some libraries.
 		public static void Log(string output)
 		{
diff --git a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
index 8787374ed9..ba6edf6e1d 100644
--- a/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
+++ b/BizHawk.Client.EmuHawk/tools/Lua/LuaConsole.cs
@@ -334,7 +334,7 @@ namespace BizHawk.Client.EmuHawk
 
 			OutputBox.Invoke(() =>
 			{
-				OutputBox.Text += message + "\n";
+				OutputBox.Text += message;
 				OutputBox.SelectionStart = OutputBox.Text.Length;
 				OutputBox.ScrollToCaret();
 			});