X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FDoGameStuff.c;h=81f4a9546becbef16c27058cd7d70e6998385250;hb=18863a5655e9e07d548e2d673e7f82336703c8fb;hp=3d856d542da029eb0cd8adcce9c509b85644dcd5;hpb=79d7ca29718d025ed0b131bf5389685fe9b941c4;p=rocksndiamonds.git diff --git a/src/game_sp/DoGameStuff.c b/src/game_sp/DoGameStuff.c index 3d856d54..81f4a954 100644 --- a/src/game_sp/DoGameStuff.c +++ b/src/game_sp/DoGameStuff.c @@ -75,30 +75,57 @@ int subDoGameStuff() // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - if (KillMurphyFlag == 1 || MurphyMoveCounter == 0) { +#if 1 + if (LeadOutCounter == 0 && + !game_sp.LevelSolved && + !game_sp.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.GameOver = TRUE; +#endif + +#endif } #if 1 +#if 0 + printf("::: *** %d, %d, %d\n", KillMurphyFlag, + game_sp.LevelSolved, game_sp.GameOver); +#endif + +#if 0 if (KillMurphyFlag == 1 && - !game_sp_info.LevelSolved && - !game_sp_info.GameOver) + !game_sp.LevelSolved && + !game_sp.GameOver) { #if 1 printf("::: DoGameStuff.c: !!!!!!!!!! GAME OVER !!!!!!!!!!\n"); #endif - game_sp_info.GameOver = TRUE; + game_sp.GameOver = TRUE; } #endif - +#endif } // loc_g_22FB: