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

rename game_board::all_survivors_to_recall

Browse source
This commit is contained in:
gfgtdf 2014-10-31 21:14:27 +01:00
parent 9d52c08039
commit ff9f9ceb3a
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/game_board.cpp
View file

@ -74,15 +74,12 @@ void game_board::set_all_units_user_end_turn() {
}
}
void game_board::all_survivors_to_recall() {
void game_board::heal_all_survivors() {
for (unit_map::iterator it = units_.begin(); it != units_.end(); it++) {
unit_ptr un = it.get_shared_ptr();
if (teams_[un->side() - 1].persistent()) {
un->new_turn();
un->new_scenario();
#if 0
teams_[un->side() - 1].recall_list().push_back(un);
#endif
}
}
}

2
src/game_board.hpp
View file

@ -108,7 +108,7 @@ class game_board : public display_context {
void end_turn(int pnum);
void set_all_units_user_end_turn();
void all_survivors_to_recall();
void heal_all_survivors();
// Manipulator from playturn

6
src/playsingle_controller.cpp
View file

@ -567,10 +567,8 @@ LEVEL_RESULT playsingle_controller::play_scenario(
sound::play_music_once(victory_music);
}
// Add all the units that survived the scenario.
// this function doesn't move unit to the recalllist anymore i just keep this name to prevent merging conflicts.
LOG_NG << "Add units that survived the scenario to the recall list.\n";
gamestate_.board_.all_survivors_to_recall();
LOG_NG << "Healing survived units\n";
gamestate_.board_.heal_all_survivors();
saved_game_.remove_snapshot();
if(!is_observer()) {