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

More tweaks to planned move/attack appearance.

Browse source
This commit is contained in:
Gabriel Morin 2011-11-30 05:29:33 +00:00
parent 652647ee15
commit 634b68c0ec
1 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/whiteboard/highlight_visitor.cpp
View file

@ -265,17 +265,32 @@ void highlight_visitor::visit(move_ptr move)
}
if (move->fake_unit_)
{
side_actions& sa = *resources::teams->at(move->team_index()).get_side_actions();
side_actions::iterator last_action = sa.find_last_action_of(move->get_unit());
if(last_action != sa.end() && *last_action != move)
{
move->fake_unit_->set_disabled_ghosted(false);
}
move->fake_unit_->set_disabled_ghosted(false);
}
break;
default:
assert (false);
break;
}
//Last action with a fake unit always gets normal appearance
//Override choices above
if (move->fake_unit_)
{
side_actions& sa = *resources::teams->at(move->team_index()).get_side_actions();
side_actions::iterator last_action = sa.find_last_action_of(move->get_unit());
side_actions::iterator second_to_last_action =
last_action != sa.end() && last_action != sa.begin() ? last_action - 1 : sa.end();
bool this_is_last_action = last_action != sa.end() && move == *last_action;
bool last_action_has_fake_unit = last_action != sa.end() && (*last_action)->get_fake_unit();
bool this_is_second_to_last_action = (second_to_last_action != sa.end()
&& move == *second_to_last_action);
if (this_is_last_action
|| (this_is_second_to_last_action && !last_action_has_fake_unit))
{
move->fake_unit_->set_standing(true);
}
}
}