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

Editor/Action Village: cleaned up some messy code @GregoryLundberg pointed out

Browse source 
Also fixes the issue brought up in #2111.
This commit is contained in:
Charles Dang 2017-10-21 17:09:50 +11:00
parent d480df850a
commit fcaa4efc46
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/editor/action/action_village.cpp
View file

@ -29,20 +29,21 @@ IMPLEMENT_ACTION(village)
editor_action* editor_action_village::perform(map_context& mc) const
{
editor_action_ptr undo;
if(!mc.get_map().is_village(loc_)) {
return nullptr;
}
std::vector<team>& teams = mc.get_teams();
team* t = unsigned(side_number_) < teams.size() ? &teams[side_number_] : nullptr;
if(t && t->owns_village(loc_)) {
return nullptr;
try {
if(teams.at(side_number_).owns_village(loc_)) {
return nullptr;
}
} catch(const std::out_of_range&) {
// side_number_ was an invalid team index.
}
undo.reset(new editor_action_village_delete(loc_));
editor_action_ptr undo(new editor_action_village_delete(loc_));
for(const team& t : teams) {
if(t.owns_village(loc_)) {