Author: tschmitz
Date: Thu Jul 14 07:36:47 2011
New Revision: 50296
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50296&view=rev
Log:
Fixed whiteboard issue with resetting movement points.
Modified:
trunk/src/play_controller.cpp
trunk/src/whiteboard/manager.cpp
trunk/src/whiteboard/manager.hpp
Modified: trunk/src/play_controller.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/play_controller.cpp?rev=50296&r1=50295&r2=50296&view=diff
==============================================================================
--- trunk/src/play_controller.cpp (original)
+++ trunk/src/play_controller.cpp Thu Jul 14 07:36:47 2011
@@ -560,8 +560,6 @@
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 @@
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
Modified: trunk/src/whiteboard/manager.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/manager.cpp?rev=50296&r1=50295&r2=50296&view=diff
==============================================================================
--- trunk/src/whiteboard/manager.cpp (original)
+++ trunk/src/whiteboard/manager.cpp Thu Jul 14 07:36:47 2011
@@ -221,11 +221,8 @@
return true;
}
-void manager::on_init_side(bool is_replay)
-{
- if (is_replay)
- return;
-
+void manager::on_init_side()
+{
validate_viewer_actions();
wait_for_side_init_ = false;
LOG_WB << "on_init_side()\n";
Modified: trunk/src/whiteboard/manager.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/manager.hpp?rev=50296&r1=50295&r2=50296&view=diff
==============================================================================
--- trunk/src/whiteboard/manager.hpp (original)
+++ trunk/src/whiteboard/manager.hpp Thu Jul 14 07:36:47 2011
@@ -69,7 +69,7 @@
/**
* 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();}
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
