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

Fix my fix to my fix to my fix to the wesnoth.set_village_owner impl

Browse source 
Should restore the behavior lost in 09906135b5 where in attempting to assign a village
to a new side that was defeated will have no effect. My changes made it that the village
would still be unassigned from the old side in that case.
This commit is contained in:
Charles Dang 2018-02-17 16:14:08 +11:00
parent 6b52d16fae
commit 1196225017
1 changed files with 27 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
src/scripting/game_lua_kernel.cpp
View file

@ -1141,25 +1141,44 @@ int game_lua_kernel::intf_set_village_owner(lua_State *L)
const int old_side_num = board().village_owner(loc) + 1;
const int new_side_num = lua_isnoneornil(L, 2) ? 0 : luaL_checkinteger(L, 2);
team* old_side = nullptr;
team* new_side = nullptr;
if(old_side_num == new_side_num) {
return 0;
}
try {
board().get_team(old_side_num).lose_village(loc);
old_side = &board().get_team(old_side_num);
} catch(const std::out_of_range&) {
// old_side_num is invalid, most likely because the village wasn't captured.
old_side = nullptr;
}
try {
team& new_side = board().get_team(new_side_num);
if(!board().team_is_defeated(new_side)) {
new_side.get_village(loc, old_side_num, (luaW_toboolean(L, 4) ? &gamedata() : nullptr));
}
new_side = &board().get_team(new_side_num);
} catch(const std::out_of_range&) {
// new_side_num is invalid. This covers the case where it equals 0,
// which is supposed to only un-assign the side (done above).
// new_side_num is invalid.
new_side = nullptr;
}
// The new side was valid, but already defeated. Do nothing.
if(new_side && board().team_is_defeated(*new_side)) {
return 0;
}
// Even if the new side is not valid, we still want to remove the village from the old side.
// This covers the case where new_side_num equals 0. The behavior in that case is to simply
// un-assign the village from the old side, which of course we also want to happen if the new
// side IS valid. If the village in question hadn't been captured, this won't fire (old_side
// will be a nullptr).
if(old_side) {
old_side->lose_village(loc);
}
// If the new side was valid, re-assign the village.
if(new_side) {
new_side->get_village(loc, old_side_num, (luaW_toboolean(L, 4) ? &gamedata() : nullptr));
}
return 0;