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

don't assert on network input

Browse source
This commit is contained in:
gfgtdf 2018-03-04 22:30:04 +01:00 • committed by GitHub
parent beed7bfe72
commit 18ee8b767c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/playmp_controller.cpp
View file

@ -433,8 +433,13 @@ void playmp_controller::pull_remote_choice()
// Also undo_stack()clear() must be called synced so we cannot do that here.
assert(!current_team().is_local() || !undo_stack().can_undo());
turn_info::PROCESS_DATA_RESULT res = turn_data_.sync_network();
assert(res != turn_info::PROCESS_END_LINGER);
assert(res != turn_info::PROCESS_END_TURN);
if(res == turn_info::PROCESS_END_LINGER) {
// Probably some bad OOS, but there is currently no way to recover from this.
throw ingame_wesnothd_error("");
}
if(res == turn_info::PROCESS_RESTART_TURN)
{
player_type_changed_ = true;