projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20091012-1-src
[rocksndiamonds.git]
/
src
/
game_sp
/
DoGameStuff.c
diff --git
a/src/game_sp/DoGameStuff.c
b/src/game_sp/DoGameStuff.c
index 27aa1c566c563625b2cb670727fc1a649258440a..3d856d542da029eb0cd8adcce9c509b85644dcd5 100644
(file)
--- a/
src/game_sp/DoGameStuff.c
+++ b/
src/game_sp/DoGameStuff.c
@@
-25,7
+25,7
@@
int subDoGameStuff()
int si, cx, dx, bl;
int si, cx, dx, bl;
- subAnimateMurphy(MurphyPosIndex); // move Murphy in any direction
+ subAnimateMurphy(
&
MurphyPosIndex); // move Murphy in any direction
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Build a database of locations and subs-to-call of animatable fields only:
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
// Build a database of locations and subs-to-call of animatable fields only:
@@
-66,16
+66,40
@@
int subDoGameStuff()
} // loop locloop_g_22B8 ' until all animatables done
}
} // loop locloop_g_22B8 ' until all animatables done
}
+#if 0
+ printf("::: DoGameStuff.c: KillMurphyFlag == %d [%d]\n",
+ KillMurphyFlag, MurphyMoveCounter);
+#endif
+
// All animations are done now
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
if (KillMurphyFlag == 1 || MurphyMoveCounter == 0)
{
if (LeadOutCounter == 0)
{
// All animations are done now
// - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
if (KillMurphyFlag == 1 || MurphyMoveCounter == 0)
{
if (LeadOutCounter == 0)
{
+#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
}
KillMurphyFlag = 0; // no more "kill Murphy"
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:
} // loc_g_22FB: