Author: tschmitz
Date: Tue Aug 2 11:55:03 2011
New Revision: 50549
URL: http://svn.gna.org/viewcvs/wesnoth?rev=50549&view=rev
Log:
Eliminated a function.
Modified:
trunk/src/actions.cpp
trunk/src/whiteboard/manager.hpp
Modified: trunk/src/actions.cpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/actions.cpp?rev=50549&r1=50548&r2=50549&view=diff
==============================================================================
--- trunk/src/actions.cpp (original)
+++ trunk/src/actions.cpp Tue Aug 2 11:55:03 2011
@@ -2656,7 +2656,9 @@
if(undo_stack != NULL) {
if(event_mutated || should_clear_stack || maybe_ui ==
units.end()
- ||
resources::whiteboard->active_and_should_clear_undo()) {
+ || (resources::whiteboard->is_active()
+ &&
resources::whiteboard->should_clear_undo()))
+ {
apply_shroud_changes(*undo_stack, team_num + 1);
undo_stack->clear();
} else {
Modified: trunk/src/whiteboard/manager.hpp
URL:
http://svn.gna.org/viewcvs/wesnoth/trunk/src/whiteboard/manager.hpp?rev=50549&r1=50548&r2=50549&view=diff
==============================================================================
--- trunk/src/whiteboard/manager.hpp (original)
+++ trunk/src/whiteboard/manager.hpp Tue Aug 2 11:55:03 2011
@@ -153,7 +153,6 @@
/// Determines whether or not the undo_stack should be cleared.
///@todo Only when there are networked allies and we have set a
preferences option
bool should_clear_undo() const {return true;}
- bool active_and_should_clear_undo() const {return manager::active_ &&
should_clear_undo();}
/// Updates shroud and clears the undo_stack and redo_stack.
void clear_undo();
_______________________________________________
Wesnoth-commits mailing list
[email protected]
https://mail.gna.org/listinfo/wesnoth-commits
