upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-05-07 19:43:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Split a part of menu_events::recall()...

Browse Source 
...into a new do_recall() method, so the whiteboard can call
do_recall() directly on planned recall execution.
This commit is contained in:
Gabriel Morin 2010-08-07 09:20:24 +00:00
parent e783cf0762
commit 1f8cd852ce
2 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
src/menu_events.cpp
View File

@ -969,26 +969,52 @@ void menu_handler::recall(int side_num, const map_location &last_hex)
}
unit un = recall_list_team[res];
if (!resources::whiteboard->save_recall(un, side_num, loc)) {
recall_list_team.erase(recall_list_team.begin() + res);
recorder.add_recall(un.id(), loc);
place_recruit(un, loc, true, true);
statistics::recall_unit(un);
current_team.spend_gold(current_team.recall_cost());
bool shroud_cleared = clear_shroud(side_num);
if (shroud_cleared) {
clear_undo_stack(side_num);
} else {
resources::undo_stack->push_back(undo_action(un, loc, undo_action::RECALL));
}
resources::redo_stack->clear();
gui_->invalidate_game_status();
gui_->invalidate_all();
recorder.add_checksum_check(loc);
do_recall(un, side_num, loc);
}
}
/// Predicate that compares the id() of two units. Used for the search in do_recall below
struct unit_comparator_predicate {
unit_comparator_predicate(const unit& unit) : unit_(unit) {}
bool operator()(const unit& unit) { return unit_.id() == unit.id(); }
private:
const unit& unit_;
};
void menu_handler::do_recall(const unit& un, int side_num, const map_location& recall_location)
{
team &current_team = teams_[side_num - 1];
std::vector<unit>& recall_list_team = current_team.recall_list();
unit_comparator_predicate comparator(un);
std::vector<unit>::iterator it = std::find_if(recall_list_team.begin(),
recall_list_team.end(), comparator);
if (it == recall_list_team.end())
{
ERR_NG << "menu_handler::do_recall(): Unit doesn't exist in recall list.\n";
return;
}
recall_list_team.erase(it);
recorder.add_recall(un.id(), recall_location);
place_recruit(un, recall_location, true, true);
statistics::recall_unit(un);
current_team.spend_gold(current_team.recall_cost());
bool shroud_cleared = clear_shroud(side_num);
if (shroud_cleared) {
clear_undo_stack(side_num);
} else {
resources::undo_stack->push_back(undo_action(un, recall_location, undo_action::RECALL));
}
resources::redo_stack->clear();
gui_->invalidate_game_status();
gui_->invalidate_all();
recorder.add_checksum_check(recall_location);
}
void menu_handler::undo(int side_num)
{
if(resources::undo_stack->empty())

1
src/menu_events.hpp
View File

@ -95,6 +95,7 @@ public:
void move_unit_to_loc(const unit_map::const_iterator& ui, const map_location& target,
bool continue_move, int side_num, mouse_handler &mousehandler);
void do_recruit(const std::string& name, int side_num, const map_location& last_hex);
void do_recall(const unit& un, int side_num, const map_location& recall_location);
void do_speak();
void do_search(const std::string& new_search);
void do_command(const std::string &str);