upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-02 10:18:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make the attacker argument to wesnoth.units.resistance optional

Browse Source
This commit is contained in:
Celtic Minstrel 2019-11-15 22:23:34 -05:00
parent aaa2dc4ece
commit 18df2fd910
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/scripting/game_lua_kernel.cpp
View File

@ -2421,11 +2421,16 @@ static int intf_unit_resistance(lua_State *L)
{
const unit& u = luaW_checkunit(L, 1);
char const *m = luaL_checkstring(L, 2);
bool a = luaW_toboolean(L, 3);
bool a = false;
map_location loc = u.get_location();
if (!lua_isnoneornil(L, 4)) {
loc = luaW_checklocation(L, 4);
if(lua_isboolean(L, 3) {
a = luaW_toboolean(L, 3);
if(!lua_isnoneornil(L, 4)) {
loc = luaW_checklocation(L, 4);
}
} else if(!lua_isnoneornil(L, 3)) {
loc = luaW_checklocation(L, 3);
}
lua_pushinteger(L, u.resistance_against(m, a, loc));