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

Fixed whiteboard issue with resetting movement points.

Browse Source
This commit is contained in:
Tommy Schmitz 2011-07-14 05:36:47 +00:00
parent e1890d3a57
commit df34398e1f
3 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/play_controller.cpp
View File

@ -560,8 +560,6 @@ void play_controller::init_side(const unsigned int team_index, bool is_replay){
gamestate_.get_variable("side_number") = player_number_;
gamestate_.last_selected = map_location::null_location;
resources::whiteboard->on_init_side(is_replay);
/**
* We do this only for local side when we are not replaying.
* For all other sides it is recorded in replay and replay handler has to handle calling do_init_side()
@ -651,6 +649,8 @@ void play_controller::do_init_side(const unsigned int team_index, bool is_replay
gui_->scroll_to_leader(units_, player_number_,game_display::ONSCREEN,false);
}
loading_game_ = false;
resources::whiteboard->on_init_side();
}
//builds the snapshot config from its members and their configs respectively

5
src/whiteboard/manager.cpp
View File

@ -221,11 +221,8 @@ bool manager::allow_leader_to_move(unit const& leader) const
return true;
}
void manager::on_init_side(bool is_replay)
void manager::on_init_side()
{
if (is_replay)
return;
validate_viewer_actions();
wait_for_side_init_ = false;
LOG_WB << "on_init_side()\n";

2
src/whiteboard/manager.hpp
View File

@ -69,7 +69,7 @@ public:
/**
* The on_* methods below inform the whiteboard of specific events
*/
void on_init_side(bool is_replay);
void on_init_side();
void on_finish_side_turn();
void on_mouseover_change(const map_location& hex);
void on_deselect_hex(){ erase_temp_move();}