X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame.c;h=5a97b201b510b71676ae0f3a64253e5d8a5098ba;hb=ec7383f34bac8e493eb6c68813c1affb1149890e;hp=ca13127d2e7a5866aef72e02591ed0b87daa459a;hpb=e2260726590fbcffca87320d7443153f0cdbdfe9;p=rocksndiamonds.git diff --git a/src/game.c b/src/game.c index ca13127d..5a97b201 100644 --- a/src/game.c +++ b/src/game.c @@ -4650,7 +4650,7 @@ void GameWon() void GameEnd() { int hi_pos; - boolean raise_level = FALSE; + int last_level_nr = level_nr; local_player->LevelSolved_GameEnd = TRUE; @@ -4693,30 +4693,23 @@ void GameEnd() if (setup.increment_levels && level_nr < leveldir_current->last_level) - raise_level = TRUE; /* advance to next level */ + { + level_nr++; /* advance to next level */ + TapeErase(); /* start with empty tape */ + } + + hi_pos = NewHiScore(last_level_nr); - if ((hi_pos = NewHiScore(level_nr)) >= 0) + if (hi_pos >= 0) { SetGameStatus(GAME_MODE_SCORES); - DrawHallOfFame(level_nr, hi_pos); - - if (raise_level) - { - level_nr++; - TapeErase(); - } + DrawHallOfFame(last_level_nr, hi_pos); } else { SetGameStatus(GAME_MODE_MAIN); - if (raise_level) - { - level_nr++; - TapeErase(); - } - DrawMainMenu(); } }