Author: tschmitz
Date: Mon Aug 22 12:06:43 2011
New Revision: 50876
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50876&view=rev
Log:
Eliminated confirmation dialog when ending turn with multi-turn plans.
Modified:
trunk/src/whiteboard/manager.cpp
trunk/src/whiteboard/manager.hpp
Modified: trunk/src/whiteboard/manager.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/manager.cpp?rev=50876&r1=50875&r2=50876&view=diff
==============================================================================
--- trunk/src/whiteboard/manager.cpp (original)
+++ trunk/src/whiteboard/manager.cpp Mon Aug 22 12:06:43 2011
@@ -318,7 +318,8 @@
bool manager::current_side_has_actions()
{
- return !current_side_actions()->empty();
+ side_actions::range_t range = current_side_actions()->iter_turn(0);
+ return range.first != range.second; //non-empty range
}
void manager::validate_viewer_actions()
Modified: trunk/src/whiteboard/manager.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/manager.hpp?rev=50876&r1=50875&r2=50876&view=diff
==============================================================================
--- trunk/src/whiteboard/manager.hpp (original)
+++ trunk/src/whiteboard/manager.hpp Mon Aug 22 12:06:43 2011
@@ -85,7 +85,7 @@
/// Adds a side_actions::net_cmd to net_buffer_[team_index], whereupon
it will (later) be sent to all allies
void queue_net_cmd(size_t team_index, side_actions::net_cmd const&);
- /// Whether the current side has actions in its planned actions queue
+ /// Whether the current side has actions in the first turn of its
planned actions queue
static bool current_side_has_actions();
/// Validates all actions of the current viewing side
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
