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

Fixed bug #19066: allow attack (and post-attack advancement selection)...

Browse source 
...to happen normally without causing OOS if turn time runs out in
attack selection dialog.
This commit is contained in:
Iurii Chernyi 2012-01-18 00:18:09 +00:00
parent 242605e006
commit 0fc0986ce2
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
changelog
View file

@ -24,6 +24,8 @@ Version 1.9.14+svn:
* Fix eras other than the default breaking 2p_Hornshark_Island. If a player
has a faction not in the default era, a standard set of units (aimed at
Khalifate) is used now.
* Fixed bug #19066: allow attack to happen normally without causing OOS if
turn time runs out in attack selection dialog.
* Terrain:
* Removed tags ignored by engine (as reported by lipk in
http://forums.wesnoth.org/viewtopic.php?f=21&t=35832 )

2
players_changelog
View file

@ -18,6 +18,8 @@ Version 1.9.14+svn:
* Fix eras other than the default breaking 2p_Hornshark_Island. If a player
has a faction not in the default era, a standard set of units (aimed at
Khalifate) is used now.
* Fixed bug #19066: allow attack to happen normally without causing OOS if
turn time runs out in attack selection dialog.
Version 1.9.14:

4
src/playmp_controller.cpp
View file

@ -279,7 +279,9 @@ void playmp_controller::play_human_turn(){
}
turn_data_->send_data();
throw end_turn_exception();
if (!rand_rng::has_new_seed_callback()) {
throw end_turn_exception();
}
}
}