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

remove redundant error handling code in linger()

Browse source 
Since 1.18 linger() is called indirectly by play_scenario_main_loop()
and play_scenario() which already catches therse erros and offers the option to save the game then.

The special handlng of ingame_wesnothd_error was removed since it
was only added to fix the case of the host leaving resulting in the
game aborting (which should no loner be the case)
This commit is contained in:
gfgtdf 2024-03-01 02:35:16 +01:00
parent c452f498de
commit 102ba5801e
1 changed files with 1 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/playmp_controller.cpp
View file

@ -228,28 +228,12 @@ void playmp_controller::linger()
bool quit;
do {
quit = true;
try {
{
// reimplement parts of play_side()
turn_data_.send_data();
play_linger_turn();
turn_data_.send_data();
LOG_NG << "finished human turn";
} catch(const leavegame_wesnothd_error& e) {
scoped_savegame_snapshot snapshot(*this);
savegame::ingame_savegame save(saved_game_, preferences::save_compression_format());
if(e.message == "") {
save.save_game_interactive(_("A network disconnection has occurred, and the game cannot continue. Do you want to save the game?"),
savegame::savegame::YES_NO);
} else {
save.save_game_interactive(
_("This game has been ended.\nReason: ") + e.message + _("\nDo you want to save the game?"),
savegame::savegame::YES_NO);
}
throw;
} catch(const ingame_wesnothd_error&) {
LOG_NG << "caught network-error-exception";
quit = false;
}
} while(!quit);