X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FDoGameStuff.c;h=7a7c1ac77919bfb0dc60bef1f6cc901e2999715d;hb=520916c89d7d96944bf3d66e3caa5afd840df74c;hp=27aa1c566c563625b2cb670727fc1a649258440a;hpb=8d3d7d213a9691455a49544624bf380e85f43461;p=rocksndiamonds.git

diff --git a/src/game_sp/DoGameStuff.c b/src/game_sp/DoGameStuff.c
index 27aa1c56..7a7c1ac7 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()
 {
-  int subDoGameStuff;
-
   int si, cx, dx, bl;
+  int InfotronsNeeded_last = InfotronsNeeded;
+
+  subAnimateMurphy(&MurphyPosIndex);       // move Murphy in any direction
 
-  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
@@ -67,20 +67,21 @@ int subDoGameStuff()
   }
 
   // All animations are done now
-  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+  // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   if (KillMurphyFlag == 1 || MurphyMoveCounter == 0)
   {
-    if (LeadOutCounter == 0)
+    if (LeadOutCounter == 0 &&
+	!game_sp.LevelSolved &&
+	!game_sp.GameOver)
     {
-      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
+
+      /* give Murphy some more time (LeadOutCounter) to reach the exit */
     }
   } //  loc_g_22FB:
-
-
-  return subDoGameStuff;
-} // subDoGameStuff
+}
 
 static boolean IsToBeAnimated(int bl)
 {