projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20091023-1-src
[rocksndiamonds.git]
/
src
/
game_sp
/
DoGameStuff.c
diff --git
a/src/game_sp/DoGameStuff.c
b/src/game_sp/DoGameStuff.c
index 3d856d542da029eb0cd8adcce9c509b85644dcd5..ce1d77e2d6b8b12d181ea63b15d112e17dab2160 100644
(file)
--- a/
src/game_sp/DoGameStuff.c
+++ b/
src/game_sp/DoGameStuff.c
@@
-75,7
+75,13
@@
int subDoGameStuff()
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
if (KillMurphyFlag == 1 || MurphyMoveCounter == 0)
{
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
if (KillMurphyFlag == 1 || MurphyMoveCounter == 0)
{
+#if 1
+ if (LeadOutCounter == 0 &&
+ !game_sp_info.LevelSolved &&
+ !game_sp_info.GameOver)
+#else
if (LeadOutCounter == 0)
if (LeadOutCounter == 0)
+#endif
{
#if 0
printf("::: DoGameStuff.c: killing murphy [%d] ...\n", KillMurphyFlag);
{
#if 0
printf("::: DoGameStuff.c: killing murphy [%d] ...\n", KillMurphyFlag);
@@
-84,9
+90,23
@@
int subDoGameStuff()
KillMurphyFlag = 0; // no more "kill Murphy"
ExplodeFieldSP(MurphyExplodePos); // Explode
LeadOutCounter = 0x40; // quit: start lead-out
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 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 (KillMurphyFlag == 1 &&
!game_sp_info.LevelSolved &&
!game_sp_info.GameOver)
@@
-98,7
+118,7
@@
int subDoGameStuff()
game_sp_info.GameOver = TRUE;
}
#endif
game_sp_info.GameOver = TRUE;
}
#endif
-
+#endif
} // loc_g_22FB:
} // loc_g_22FB: