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

Lua API: Fix location in put_unit not working as 2nd/3rd param

Browse source
This commit is contained in:
Celtic Minstrel 2015-10-20 00:36:16 -04:00
parent 31ae13da1e
commit c5a08251a1
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/scripting/game_lua_kernel.cpp
View file

@ -2320,12 +2320,12 @@ int game_lua_kernel::intf_put_unit(lua_State *L)
else if (!lua_isnoneornil(L, unit_arg))
{
config cfg = luaW_checkconfig(L, unit_arg);
if (unit_arg == 1) {
if (unit_arg == 1 && !map().on_board(loc)) {
loc.x = cfg["x"] - 1;
loc.y = cfg["y"] - 1;
if (!map().on_board(loc))
return luaL_argerror(L, 1, "invalid location");
} else {
return luaL_argerror(L, 2, "invalid location");
} else if (unit_arg != 1) {
WRN_LUA << "wesnoth.put_unit(x, y, unit) is deprecated. Use wesnoth.put_unit(unit, x, y) instead\n";
}
u = unit_ptr (new unit(cfg, true));