upstream/wesnoth
1
0
Fork 0
mirror of https://github.com/wesnoth/wesnoth synced 2025-04-30 01:47:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't allow "Press t to continue" if we're executing a whiteboard move.

Browse Source 
Fixes bug #19744.
This commit is contained in:
J. Tyne 2012-07-19 05:13:02 +00:00
parent ad7b39687b
commit e6c069bb87
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/actions.cpp
View File

@ -3575,8 +3575,10 @@ public:
if ( move_it_.valid() ) {
// Update the moving unit.
move_it_->set_interrupted_move(sighted_stop_ ? *(full_end_-1) :
map_location::null_location);
move_it_->set_interrupted_move(
sighted_stop_ && !resources::whiteboard->is_executing_actions() ?
*(full_end_-1) :
map_location::null_location);
if ( ambushed_ || final_hex() == zoc_stop_ )
move_it_->set_movement(0);