X-Git-Url: https://git.artsoft.org/?p=rocksndiamonds.git;a=blobdiff_plain;f=src%2Fgame_sp%2FDoGameStuff.c;h=79b102d6dbfd8307df3e0f283b463cf116d929cd;hp=ce1d77e2d6b8b12d181ea63b15d112e17dab2160;hb=c40a5c6109e586ce4049ca0900e5fb9c9ac60fb7;hpb=725f2361ad1932897edef8849a86d9ba7f65424f

diff --git a/src/game_sp/DoGameStuff.c b/src/game_sp/DoGameStuff.c
index ce1d77e2..79b102d6 100644
--- a/src/game_sp/DoGameStuff.c
+++ b/src/game_sp/DoGameStuff.c
@@ -4,30 +4,30 @@
 
 #include "DoGameStuff.h"
 
+
 static void CallAnimation(int si, byte bl);
 static boolean IsToBeAnimated(int bl);
 
-// static char *VB_Name = "modDoGameStuff";
-
-// --- Option Explicit
+int AnimationPosTable[SP_MAX_PLAYFIELD_SIZE];
+byte AnimationSubTable[SP_MAX_PLAYFIELD_SIZE];
 
-int *AnimationPosTable;
-byte *AnimationSubTable;
 
 // ==========================================================================
 //                              SUBROUTINE
 // Do game stuff
 // ==========================================================================
 
-int subDoGameStuff()
+void subDoGameStuff(void)
 {
-  int subDoGameStuff;
-
   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.
   // first and last line are not animated.
@@ -52,7 +52,7 @@ int subDoGameStuff()
   }
   while (0 < cx); // locloop_g_2282' until all lines scanned(not top- and bottom edge)
 
-  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   // Now use the database to animate all animatables the fastest way.
   // All the other fields are not checked anymore: those have no database entry.
   // The field from before animation is frozen in the database in order not to
@@ -66,65 +66,22 @@ int subDoGameStuff()
     } // 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 1
     if (LeadOutCounter == 0 &&
-	!game_sp_info.LevelSolved &&
-	!game_sp_info.GameOver)
-#else
-    if (LeadOutCounter == 0)
-#endif
-    {
-#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)
+	!game_sp.level_solved &&
+	!game_sp.game_over)
     {
-#if 1
-      printf("::: DoGameStuff.c: !!!!!!!!!! GAME OVER !!!!!!!!!!\n");
-#endif
+      KillMurphyFlag = 0;			// no more "kill Murphy"
+      ExplodeFieldSP(MurphyExplodePos);		// Explode
+      LeadOutCounter = 0x40;			// quit: start lead-out
 
-      game_sp_info.GameOver = TRUE;
+      // give Murphy some more time (LeadOutCounter) to reach the exit
     }
-#endif
-#endif
-
   } //  loc_g_22FB:
-
-
-  return subDoGameStuff;
-} // subDoGameStuff
+}
 
 static boolean IsToBeAnimated(int bl)
 {