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

better error on invalid variablename in wesnoth.set_variable

Browse source 
first we now throw a lua error instead of just giving a log message this
makes it easier to find the source of a bug becase we now get a
stacktrace.

Also we now give a more detailed error message.
This commit is contained in:
gfgtdf 2014-12-28 22:47:50 +01:00
parent 57227f4030
commit 7f0e7c890d
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/scripting/game_lua_kernel.cpp
View file

@ -738,10 +738,11 @@ int game_lua_kernel::intf_set_variable(lua_State *L)
gamedata().clear_variable(m);
return 0;
}
int variabletype = lua_type(L, 2);
try
{
variable_access_create v = gamedata().get_variable_access_write(m);
switch (lua_type(L, 2)) {
switch (variabletype) {
case LUA_TBOOLEAN:
v.as_scalar() = luaW_toboolean(L, 2);
break;
@ -771,7 +772,8 @@ int game_lua_kernel::intf_set_variable(lua_State *L)
}
catch (const invalid_variablename_exception&)
{
ERR_LUA << "invlid variable name in wesnoth.set_veriable" << std::endl;
std::string msg = "invalid variable name '" + m + "' for type '" + lua_typename(L, variabletype) + "'";
return luaL_argerror(L, 1, msg.c_str());
}
return 0;
}