X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FDoGameStuff.c;h=d41da8c37157b22de6391797f33366ae4b652282;hb=3b19d917acb541df11a45e0d4b4e40ad4e38a717;hp=458f8aa653075e9f05c2d0aa4c929ba4201a0ec0;hpb=0d95c7df5f708c3f30e10cab3894082019f8cd6c;p=rocksndiamonds.git diff --git a/src/game_sp/DoGameStuff.c b/src/game_sp/DoGameStuff.c index 458f8aa6..d41da8c3 100644 --- a/src/game_sp/DoGameStuff.c +++ b/src/game_sp/DoGameStuff.c @@ -75,9 +75,13 @@ int subDoGameStuff() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if (KillMurphyFlag == 1 || MurphyMoveCounter == 0) { +#if 1 + if (LeadOutCounter == 0 && !game_sp_info.LevelSolved) +#else if (LeadOutCounter == 0) +#endif { -#if 0 +#if 1 printf("::: DoGameStuff.c: killing murphy [%d] ...\n", KillMurphyFlag); #endif @@ -85,6 +89,21 @@ int subDoGameStuff() ExplodeFieldSP(MurphyExplodePos); // Explode LeadOutCounter = 0x40; // quit: start lead-out } + +#if 1 + if (KillMurphyFlag == 1 && + !game_sp_info.LevelSolved && + !game_sp_info.GameOver) + { +#if 1 + printf("::: DoGameStuff.c: !!!!!!!!!! GAME OVER !!!!!!!!!!\n"); +#endif + + game_sp_info.GameOver = TRUE; + } +#endif + + } // loc_g_22FB: