From: Holger Schemel Date: Fri, 12 Oct 2018 21:41:05 +0000 (+0200) Subject: fixed handling game actions during "play again" request in network mode X-Git-Tag: 4.1.2.0~132 X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=298cffce2845fea10a2f0420a26db13ea9179e57;p=rocksndiamonds.git fixed handling game actions during "play again" request in network mode --- diff --git a/src/game.c b/src/game.c index eed45977..8d1954da 100644 --- a/src/game.c +++ b/src/game.c @@ -11346,7 +11346,8 @@ static void GameActionsExt(void) if (game_status != GAME_MODE_PLAYING) return; - if (!network_player_action_received) + /* check if network player actions still missing and game still running */ + if (!network_player_action_received && !checkGameEnded()) return; /* failed to get network player actions in time */ /* do not yet reset "network_player_action_received" (for tape.pausing) */ @@ -11386,7 +11387,7 @@ static void GameActionsExt(void) stored_player[i].effective_action = stored_player[i].action; } - if (network_playing) + if (network_playing && !checkGameEnded()) SendToServer_MovePlayer(summarized_player_action); // summarize all actions at local players mapped input device position