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

Whiteboard/validate_visitor: iterator reuse.

Browse source
This commit is contained in:
Gabriel Morin 2010-08-10 05:15:58 +00:00
parent b488a236e2
commit c6f278cdb5
1 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
src/whiteboard/validate_visitor.cpp
View file

@ -84,13 +84,16 @@ void validate_visitor::visit_move(move_ptr move)
if (!(move->get_source_hex().valid() && move->get_dest_hex().valid()))
move->set_valid(false);
if (move->valid_ && resources::units->find(move->get_source_hex()) == resources::units->end())
move->set_valid(false);
{ //limit scope of "it"
unit_map::const_iterator it = resources::units->find(move->get_source_hex());
if (move->valid_ && it == resources::units->end())
move->set_valid(false);
//check if the unit in the source hex has the same unit id as before,
//i.e. that it's the same unit
if (move->valid_ && move->unit_id_ != resources::units->find(move->get_source_hex())->id())
move->set_valid(false);
//check if the unit in the source hex has the same unit id as before,
//i.e. that it's the same unit
if (move->valid_ && move->unit_id_ != it->id())
move->set_valid(false);
}
if (move->valid_ && move->get_source_hex() != move->get_dest_hex()) //allow for zero-hex, move, in which case we skip pathfinding
{