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

Fix wesnoth.erase_unit for recall units

Browse source
This commit is contained in:
Celtic Minstrel 2016-03-17 22:41:05 -04:00
parent 8b2ba647d1
commit f02a038879
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/scripting/game_lua_kernel.cpp
View file

@ -2373,11 +2373,7 @@ int game_lua_kernel::intf_erase_unit(lua_State *L)
}
map_location loc;
if (luaW_tolocation(L, 1, loc)) {
if (!map().on_board(loc)) {
return luaL_argerror(L, 1, "invalid location");
}
} else if (luaW_hasmetatable(L, 1, getunitKey)) {
if (luaW_hasmetatable(L, 1, getunitKey)) {
lua_unit *lu = static_cast<lua_unit *>(lua_touserdata(L, 1));
unit_ptr u = lu->get_shared();
if (!lu->get()) {
@ -2395,6 +2391,10 @@ int game_lua_kernel::intf_erase_unit(lua_State *L)
} else {
return luaL_argerror(L, 1, "can't erase private units");
}
} else if (luaW_tolocation(L, 1, loc)) {
if (!map().on_board(loc)) {
return luaL_argerror(L, 1, "invalid location");
}
} else if (!lua_isnoneornil(L, 1)) {
config cfg = luaW_checkconfig(L, 1);
loc.x = cfg["x"] - 1;