Author: tschmitz
Date: Thu Aug 4 00:00:37 2011
New Revision: 50577
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50577&view=rev
Log:
Fixed bug when planning a move to a village out of turn.
Modified:
trunk/src/whiteboard/move.cpp
trunk/src/whiteboard/move.hpp
Modified: trunk/src/whiteboard/move.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/move.cpp?rev=50577&r1=50576&r2=50577&view=diff
==============================================================================
--- trunk/src/whiteboard/move.cpp (original)
+++ trunk/src/whiteboard/move.cpp Thu Aug 4 00:00:37 2011
@@ -73,6 +73,9 @@
mover_(),
fake_unit_hidden_(false)
{
+ //Future unit map must be valid during construction, so that move can
find its unit
+ scoped_planned_unit_map raii;
+
assert(!route_->steps.empty());
if(hidden)
Modified: trunk/src/whiteboard/move.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/move.hpp?rev=50577&r1=50576&r2=50577&view=diff
==============================================================================
--- trunk/src/whiteboard/move.hpp (original)
+++ trunk/src/whiteboard/move.hpp Thu Aug 4 00:00:37 2011
@@ -37,7 +37,6 @@
friend class validate_visitor;
friend class highlight_visitor;
- ///Future unit map must be valid during construction, so that move can
find its unit
move(size_t team_index, bool hidden, const pathfind::marked_route&
route, arrow_ptr arrow,
fake_unit_ptr fake_unit);
move(config const&, bool hidden); // For deserialization
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits