X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FDoGameStuff.c;h=8e7d8830c9dc360fa294616da41450cdf098c5f9;hb=572a4bab20b6f36ef1a4782094b27ac5a703a476;hp=458f8aa653075e9f05c2d0aa4c929ba4201a0ec0;hpb=0d95c7df5f708c3f30e10cab3894082019f8cd6c;p=rocksndiamonds.git diff --git a/src/game_sp/DoGameStuff.c b/src/game_sp/DoGameStuff.c index 458f8aa6..8e7d8830 100644 --- a/src/game_sp/DoGameStuff.c +++ b/src/game_sp/DoGameStuff.c @@ -75,16 +75,58 @@ int subDoGameStuff() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if (KillMurphyFlag == 1 || MurphyMoveCounter == 0) { +#if 1 + if (LeadOutCounter == 0 && + !game_sp_info.LevelSolved && + !game_sp_info.GameOver) +#else if (LeadOutCounter == 0) +#endif { -#if 0 +#if 1 printf("::: DoGameStuff.c: killing murphy [%d] ...\n", KillMurphyFlag); #endif KillMurphyFlag = 0; // no more "kill Murphy" ExplodeFieldSP(MurphyExplodePos); // Explode LeadOutCounter = 0x40; // quit: start lead-out + +#if 1 + +#if 1 + printf("::: DoGameStuff.c: !!!!!!!!!! GAME OVER !!!!!!!!!!\n"); + printf("::: [KillMurphyFlag == %d]\n", KillMurphyFlag); +#endif + +#if 1 + /* give Murphy some more time (LeadOutCounter) to reach the exit */ +#else + game_sp_info.GameOver = TRUE; +#endif + +#endif } + +#if 1 +#if 0 + printf("::: *** %d, %d, %d\n", KillMurphyFlag, + game_sp_info.LevelSolved, game_sp_info.GameOver); +#endif + +#if 0 + 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 +#endif + } // loc_g_22FB: