0ct0pu5/wesnoth
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Two error checks that could catch some abuse of [allow_undo].

Browse source
This commit is contained in:
J. Tyne 2012-12-06 12:38:51 +00:00
parent 8f85a25638
commit d719b80801
1 changed files with 16 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/actions/undo.cpp
View file

@ -286,6 +286,14 @@ void undo_list::redo()
statistics::recall_unit(un);
gui.invalidate(loc);
recorder.add_checksum_check(loc);
// Quick error check. (Abuse of [allow_undo]?)
if ( loc != action.route.front() ) {
ERR_NG << "When redoing a recall at " << action.route.front()
<< ", the location was moved to " << loc << ".\n";
// Not really fatal, I suppose. Just update the action so
// undoing this works.
action.route.front() = loc;
}
} else {
recorder.undo();
gui::dialog(gui, "", msg,gui::OK_ONLY).show();
@ -326,6 +334,14 @@ void undo_list::redo()
current_team.set_action_bonus_count(1 + current_team.action_bonus_count());
recorder.add_checksum_check(loc);
// Quick error check. (Abuse of [allow_undo]?)
if ( loc != action.route.front() ) {
ERR_NG << "When redoing a recruit at " << action.route.front()
<< ", the location was moved to " << loc << ".\n";
// Not really fatal, I suppose. Just update the action so
// undoing this works.
action.route.front() = loc;
}
} else {
recorder.undo();
gui::dialog(gui, "", msg,gui::OK_ONLY).show();