X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FDoGameStuff.c;h=ce1d77e2d6b8b12d181ea63b15d112e17dab2160;hb=3c080c7b33b6dfcc6e0039b592c5f268535873e7;hp=d41da8c37157b22de6391797f33366ae4b652282;hpb=3b19d917acb541df11a45e0d4b4e40ad4e38a717;p=rocksndiamonds.git diff --git a/src/game_sp/DoGameStuff.c b/src/game_sp/DoGameStuff.c index d41da8c3..ce1d77e2 100644 --- a/src/game_sp/DoGameStuff.c +++ b/src/game_sp/DoGameStuff.c @@ -76,21 +76,37 @@ int subDoGameStuff() if (KillMurphyFlag == 1 || MurphyMoveCounter == 0) { #if 1 - if (LeadOutCounter == 0 && !game_sp_info.LevelSolved) + if (LeadOutCounter == 0 && + !game_sp_info.LevelSolved && + !game_sp_info.GameOver) #else if (LeadOutCounter == 0) #endif { -#if 1 +#if 0 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"); +#endif + + game_sp_info.GameOver = TRUE; +#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) @@ -102,7 +118,7 @@ int subDoGameStuff() game_sp_info.GameOver = TRUE; } #endif - +#endif } // loc_g_22FB: