X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=b7f8736a03a77ec1d932b44956ca14d871242477;hb=7f44b998d7a52222429d0794d3ec1713f37a7f47;hp=c5d941dd093b0882faf8d9b2dbd16c1e7ea23f86;hpb=c118d37bf6ad02e90d4ea7c4a4d7d34d8f745c26;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index c5d941dd..b7f8736a 100644 --- a/src/game.c +++ b/src/game.c @@ -4515,7 +4515,6 @@ void InitGame(void) } game.restart_level = FALSE; - game.restart_game_message = NULL; game.request_active = FALSE; game.request_active_or_moving = FALSE; @@ -15635,8 +15634,6 @@ void RequestQuitGame(boolean escape_key_pressed) void RequestRestartGame(char *message) { - game.restart_game_message = NULL; - boolean has_started_game = hasStartedNetworkGame(); int request_mode = (has_started_game ? REQ_ASK : REQ_CONFIRM); int door_state = DOOR_CLOSE_1; @@ -15680,14 +15677,12 @@ static char *getRestartGameMessage(void) boolean CheckRestartGame(void) { - static boolean last_game_over = FALSE; static int game_over_delay = 0; int game_over_delay_value = 50; boolean game_over = checkGameFailed(); if (!game_over) { - last_game_over = FALSE; game_over_delay = game_over_delay_value; return FALSE; @@ -15715,19 +15710,9 @@ boolean CheckRestartGame(void) if (!setup.ask_on_game_over) return FALSE; - if (last_game_over != game_over) - game.restart_game_message = getRestartGameMessage(); - - last_game_over = game_over; + RequestRestartGame(getRestartGameMessage()); - if (game.restart_game_message != NULL) - { - RequestRestartGame(game.restart_game_message); - - return TRUE; - } - - return FALSE; + return TRUE; } boolean checkGameSolved(void)