X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FDoGameStuff.c;h=79b102d6dbfd8307df3e0f283b463cf116d929cd;hb=98d421667c21a07ab69dd881f1435c2f595ddd4c;hp=5575d11a603dbd5a775784034773001fd33f7632;hpb=e51177796149f37de339bda83558c3c49758be93;p=rocksndiamonds.git

diff --git a/src/game_sp/DoGameStuff.c b/src/game_sp/DoGameStuff.c
index 5575d11a..79b102d6 100644
--- a/src/game_sp/DoGameStuff.c
+++ b/src/game_sp/DoGameStuff.c
@@ -8,13 +8,8 @@
 static void CallAnimation(int si, byte bl);
 static boolean IsToBeAnimated(int bl);
 
-#if 1
 int AnimationPosTable[SP_MAX_PLAYFIELD_SIZE];
 byte AnimationSubTable[SP_MAX_PLAYFIELD_SIZE];
-#else
-int *AnimationPosTable;
-byte *AnimationSubTable;
-#endif
 
 
 // ==========================================================================
@@ -22,12 +17,16 @@ byte *AnimationSubTable;
 // Do game stuff
 // ==========================================================================
 
-void subDoGameStuff()
+void subDoGameStuff(void)
 {
   int si, cx, dx, bl;
+  int InfotronsNeeded_last = InfotronsNeeded;
 
   subAnimateMurphy(&MurphyPosIndex);       // move Murphy in any direction
 
+  if (InfotronsNeeded != InfotronsNeeded_last)
+    game.snapshot.collected_item = TRUE;
+
   // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   // Build a database of locations and subs-to-call of animatable fields only:
   // Make a snapshot from the field before the animation cycle starts.
@@ -72,23 +71,14 @@ void subDoGameStuff()
   if (KillMurphyFlag == 1 || MurphyMoveCounter == 0)
   {
     if (LeadOutCounter == 0 &&
-	!game_sp.LevelSolved &&
-	!game_sp.GameOver)
+	!game_sp.level_solved &&
+	!game_sp.game_over)
     {
-#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 0
-      printf("::: DoGameStuff.c: !!!!!!!!!! GAME OVER !!!!!!!!!!\n");
-      printf("::: [KillMurphyFlag == %d]\n", KillMurphyFlag);
-#endif
-
-      /* give Murphy some more time (LeadOutCounter) to reach the exit */
+      // give Murphy some more time (LeadOutCounter) to reach the exit
     }
   } //  loc_g_22FB:
 }