From: Holger Schemel <info@artsoft.org>
Date: Tue, 20 Oct 2009 19:53:07 +0000 (+0200)
Subject: rnd-20091020-2-src
X-Git-Tag: 3.3.0.0^2~75
X-Git-Url: https://git.artsoft.org/?a=commitdiff_plain;h=3b19d917acb541df11a45e0d4b4e40ad4e38a717;p=rocksndiamonds.git

rnd-20091020-2-src
---

diff --git a/src/conftime.h b/src/conftime.h
index fbea7efb..232d802c 100644
--- a/src/conftime.h
+++ b/src/conftime.h
@@ -1 +1 @@
-#define COMPILE_DATE_STRING "2009-10-20 00:29"
+#define COMPILE_DATE_STRING "2009-10-20 21:52"
diff --git a/src/game_sp/DoGameStuff.c b/src/game_sp/DoGameStuff.c
index 3d856d54..d41da8c3 100644
--- a/src/game_sp/DoGameStuff.c
+++ b/src/game_sp/DoGameStuff.c
@@ -75,9 +75,13 @@ int subDoGameStuff()
   // - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
   if (KillMurphyFlag == 1 || MurphyMoveCounter == 0)
   {
+#if 1
+    if (LeadOutCounter == 0 && !game_sp_info.LevelSolved)
+#else
     if (LeadOutCounter == 0)
+#endif
     {
-#if 0
+#if 1
       printf("::: DoGameStuff.c: killing murphy [%d] ...\n", KillMurphyFlag);
 #endif
 
diff --git a/src/game_sp/MainGameLoop.c b/src/game_sp/MainGameLoop.c
index a07d6967..2baa7435 100644
--- a/src/game_sp/MainGameLoop.c
+++ b/src/game_sp/MainGameLoop.c
@@ -240,7 +240,9 @@ locRepeatMainGameLoop:                           // start repeating game loop
     printf("::: ExitToMenuFlag == True\n");
 #endif
 
+#if 0
     goto locExitMainGameLoop;
+#endif
   }
 #else
   if (ExitToMenuFlag == 1)
@@ -259,6 +261,11 @@ locRepeatMainGameLoop:                           // start repeating game loop
   // ---------------------- END OF GAME-BUSY LOOP -------------------------------
   // ----------------------------------------------------------------------------
   LeadOutCounter = LeadOutCounter - 1;             // do more lead-out after quit
+
+#if 0
+  printf("::: LeadOutCounter == %d\n", LeadOutCounter);
+#endif
+
 #if 1
   if (LeadOutCounter != 0) // lead-out not ready: more
     return subMainGameLoop;
@@ -272,6 +279,10 @@ locRepeatMainGameLoop:                           // start repeating game loop
 
 locExitMainGameLoop:
 
+#if 1
+  printf("::: locExitMainGameLoop reached [%d]\n", LeadOutCounter);
+#endif
+
 
 
 #if 1
@@ -280,10 +291,6 @@ locExitMainGameLoop:
 
 
 
-#if 0
-  printf("::: locExitMainGameLoop reached [%d]\n", LeadOutCounter);
-#endif
-
   do
   {
     DoEvents(); // user may klick on menus or move the window here ...
diff --git a/src/game_sp/Murphy.c b/src/game_sp/Murphy.c
index a2063fda..c50ecb87 100644
--- a/src/game_sp/Murphy.c
+++ b/src/game_sp/Murphy.c
@@ -1820,6 +1820,11 @@ loc_g_6F3B:
 
 loc_g_6F77:
   ExitToMenuFlag = 1;
+
+#if 1
+  PlayField16[*si] = fiSpace;	// remove Murphy from playfield after exiting
+#endif
+
   return subAnimateMurphy;
 
   // ==========================================================================