Implement llGetScriptName().

2 files changed, 16 insertions, 2 deletions

diff --git a/LuaSL/src/LSL.lua b/LuaSL/src/LSL.lua
index a89c06f..8861bf3 100644
--- a/LuaSL/src/LSL.lua
+++ b/LuaSL/src/LSL.lua
@@ -25,6 +25,7 @@ upvalue--either way is a bit more efficient and less error prone.
 
 local LSL = {};
 local SID = "";
+local scriptName = "";
 
 -- Debugging aids
 
@@ -567,6 +568,13 @@ function --[[list]]	LSL.llParseString2List(--[[string]] In, --[[list]] l, --[[li
 function --[[list]]     LSL.llParseStringKeepNulls(--[[string]] In, --[[list]] l, --[[list]] l1) return {} end;
 
 
+-- LSL script functions
+
+function --[[string]] LSL.llGetScriptName()
+  return scriptName
+end
+
+
 -- Crements stuff.
 
 function LSL.preDecrement(name) _G[name] = _G[name] - 1; return _G[name]; end;
@@ -612,11 +620,12 @@ function LSL.stateChange(x)
   end
 end;
 
-function LSL.mainLoop(sid, x)
+function LSL.mainLoop(sid, name, x)
   local status, errorMsg = luaproc.newchannel(sid)
   local result
 
   SID = sid
+  scriptName = name
 
   LSL.EOF = "\n\n\n"    -- Fix this up now.
 
diff --git a/LuaSL/src/LuaSL_compile.c b/LuaSL/src/LuaSL_compile.c
index 873e6c4..de103b7 100644
--- a/LuaSL/src/LuaSL_compile.c
+++ b/LuaSL/src/LuaSL_compile.c
@@ -2275,13 +2275,18 @@ boolean compileLSL(gameGlobals *game, Ecore_Con_Client *client, char *SID, char
             {
                 lua_State *L;
                 int err;
+                char *ext;
 
                 fprintf(out, "--// Generated code goes here.\n\n");
                 fprintf(out, "local _bit = require(\"bit\")\n");
                 fprintf(out, "local _LSL = require(\"LSL\")\n\n");
                 fprintf(out, "local _SID = [=[%s]=]\n\n", compiler.SID);
+                strcpy(buffer, basename(compiler.fileName));
+                if ((ext = rindex(buffer, '.')))
+                  ext[0] = '\0';
+                fprintf(out, "local _scriptName = [=[%s]=]\n\n", buffer);
                 outputLeaf(out, OM_LUA, compiler.ast);
-                fprintf(out, "\n\n_LSL.mainLoop(_SID, _defaultState)\n");  // This actually starts the script running.
+                fprintf(out, "\n\n_LSL.mainLoop(_SID, _scriptName, _defaultState)\n");  // This actually starts the script running.
                 fprintf(out, "\n--// End of generated code.\n\n");
                 fclose(out);