From 9ea18abb49a760fe1eda197c02cbdcd680b47204 Mon Sep 17 00:00:00 2001
From: Thorbjørn Lindeijer <thorbjorn@lindeijer.nl>
Date: Sun, 22 Aug 2010 13:32:24 +0200
Subject: Pass a script name to Lua for proper reporting of error locations

Now the Lua file name shows up in the error message and stack traceback,
or the map file and object name in case of a script embedded in a map
file.
---
 src/scripting/script.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/scripting/script.cpp')

diff --git a/src/scripting/script.cpp b/src/scripting/script.cpp
index 3d16a7d1..334895c3 100644
--- a/src/scripting/script.cpp
+++ b/src/scripting/script.cpp
@@ -88,7 +88,7 @@ bool Script::loadFile(const std::string &name)
     if (buffer)
     {
         mScriptFile = name;
-        load(skipPotentialBom(buffer));
+        load(skipPotentialBom(buffer), name.c_str());
         free(buffer);
         return true;
     } else {
@@ -99,7 +99,7 @@ bool Script::loadFile(const std::string &name)
 void Script::loadNPC(const std::string &name, int id, int x, int y,
                      const char *prog)
 {
-    load(prog);
+    load(prog, name.c_str());
     prepare("create_npc_delayed");
     push(name);
     push(id);
-- 
cgit v1.2.3-70-g09d2