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

Whiteboard: selection mechanism

Browse source
This commit is contained in:
Gabriel Morin 2010-06-15 20:37:21 +00:00
parent 5829d7d40e
commit 3c81bdbe54
3 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/mouse_events.cpp
View file

@ -592,7 +592,7 @@ bool mouse_handler::move_unit_along_current_route(bool check_shroud, bool attack
size_t moves = 0;
try {
if (resources::whiteboard->active()) {
resources::whiteboard->save_temp_move(*units_.find(steps.front()));
resources::whiteboard->save_temp_move();
} else {
moves = ::move_unit(NULL, steps, &recorder, resources::undo_stack, true, &next_unit_, false, check_shroud);
}

12
src/whiteboard/manager.cpp
View file

@ -79,7 +79,7 @@ void manager::remove_temp_modifiers()
DBG_WB << "Removed temporary modifiers.\n";
}
void manager::select_unit(const unit& unit)
void manager::select_unit(unit& unit)
{
selected_unit_ = &unit;
}
@ -107,7 +107,7 @@ void manager::create_temp_move(const std::vector<map_location> &steps)
screen->add_arrow(*move_arrow_);
// Create temp ghost unit
fake_unit_.reset(new unit(*resources::units->find(route_.front())));
fake_unit_.reset(new unit(*selected_unit_));
fake_unit_->set_location(route_.back());
fake_unit_->set_ghosted(show_ghosted_unit_bars);
screen->place_temporary_unit(fake_unit_.get());
@ -130,15 +130,15 @@ void manager::erase_temp_move()
}
}
void manager::save_temp_move(unit& subject)
void manager::save_temp_move()
{
LOG_WB << "Creating move for unit " << subject.name() << " [" << subject.id() << "]"
<< " from " << subject.get_location()
LOG_WB << "Creating move for unit " << selected_unit_->name() << " [" << selected_unit_->id() << "]"
<< " from " << selected_unit_->get_location()
<< " to " << route_.back() << "\n";
move_arrow_->set_alpha(0.6);
get_current_side_actions().queue_move(subject, route_.back(),
get_current_side_actions().queue_move(*selected_unit_, route_.back(),
*(move_arrow_.release()) /* ownership of the arrow transferred to the new move action */,
*(fake_unit_.release()) /* ownership of the fake unit transferred to the new move action */);

6
src/whiteboard/manager.hpp
View file

@ -56,7 +56,7 @@ public:
void apply_temp_modifiers();
void remove_temp_modifiers();
void select_unit(const unit& unit);
void select_unit(unit& unit);
void deselect_unit();
/** Set the route for move creation purposes */
@ -69,7 +69,7 @@ public:
* and erases the stored route. The move is inserted
* at the end of the queue, to be executed last.
*/
void save_temp_move(unit& subject);
void save_temp_move();
private:
/**
@ -84,7 +84,7 @@ private:
std::auto_ptr<arrow> move_arrow_;
std::auto_ptr<unit> fake_unit_;
unit const* selected_unit_;
unit* selected_unit_;
};
} // end namespace wb