rnd-20091020-2-src

diff --git a/src/conftime.h b/src/conftime.h
index fbea7efb1895288c8d44fad70cb09319dfbd9035..232d802cca24f9c5c09868372f9ba6264e565085 100644 (file)
--- 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 3d856d542da029eb0cd8adcce9c509b85644dcd5..d41da8c37157b22de6391797f33366ae4b652282 100644 (file)
--- 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 a07d6967a34bbad6616c68bed424c5daf1793c4c..2baa7435cc542dd2f258e55ad3a15b99b8971fe0 100644 (file)
--- 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 a2063fda6cea7ef3c506018950f57f8fee9e843b..c50ecb87f68273d4a3b38d95e1f1bbf3c5ec4cf6 100644 (file)
--- 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;
 
   // ==========================================================================