0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Added a ~lua: prefix for flagging non-WML errors.

Browse source
This commit is contained in:
Guillaume Melquiond 2010-07-25 15:34:04 +00:00
parent 4ab0dcb758
commit e5562a1b52
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
data/lua/wml-tags.lua
View file

@ -272,7 +272,9 @@ function wml_actions.lua(cfg)
args.y2 = ev.y2 args.y2 = ev.y2
table.insert(args, ev[1]) table.insert(args, ev[1])
table.insert(args, ev[2]) table.insert(args, ev[2])
assert(loadstring(cfg.code or ""))(args) local bytecode, message = loadstring(cfg.code or "")
if not bytecode then error("~lua:" .. message, 0) end
bytecode(args)
end end
function wml_actions.music(cfg) function wml_actions.music(cfg)

6
src/scripting/lua.cpp
View file

@ -392,6 +392,12 @@ bool luaW_pcall(lua_State *L
m += 5; m += 5;
char const *e = strstr(m, "stack traceback"); char const *e = strstr(m, "stack traceback");
lg::wml_error << std::string(m, e ? e - m : strlen(m)); lg::wml_error << std::string(m, e ? e - m : strlen(m));
} else if (allow_wml_error && strncmp(m, "~lua:", 5) == 0) {
m += 5;
char const *e = NULL, *em = m;
while (em[0] && ((em = strstr(em + 1, "stack traceback"))))
e = em;
chat_message("Lua error", std::string(m, e ? e - m : strlen(m)));
} else { } else {
chat_message("Lua error", m); chat_message("Lua error", m);
ERR_LUA << m << '\n'; ERR_LUA << m << '\n';