Merge pull request #6188 from cjshmyr/luaparse

Log reason why a Lua script fails to parse
This commit is contained in:
Igor Popov
2014-08-06 11:39:27 +04:00
2 changed files with 4 additions and 2 deletions

View File

@@ -10,6 +10,7 @@
using System;
using System.Collections.Generic;
using System.Drawing;
using System.IO;
using System.Linq;
using System.Reflection;
@@ -162,6 +163,7 @@ namespace OpenRA.Scripting
public void FatalError(string message)
{
Console.WriteLine("Fatal Lua Error: {0}", message);
Game.AddChatLine(Color.White, "Fatal Lua Error", message);
error = true;
}

View File

@@ -31,9 +31,9 @@ Tick = function()
end
ExecuteSandboxedScript = function(file, contents)
local script = loadstring(contents, file)
local script, err = loadstring(contents, file)
if (script == nil) then
FatalError("Error parsing " .. file)
FatalError("Error parsing " .. file .. ". Reason: " .. err)
else
TryRunSandboxed(script)
end