rnd-20091023-1-src

[rocksndiamonds.git] / src / game_sp / MainGameLoop.c

diff --git a/src/game_sp/MainGameLoop.c b/src/game_sp/MainGameLoop.c
index a07d6967a34bbad6616c68bed424c5daf1793c4c..eddb4cdd3ec60bab33f71b12d9cd2eb4d4104130 100644 (file)
--- a/src/game_sp/MainGameLoop.c
+++ b/src/game_sp/MainGameLoop.c
@@ -82,7 +82,7 @@ int subMainGameLoop_Init()
   return subMainGameLoop;
 }
 
-int subMainGameLoop_Main()
+int subMainGameLoop_Main(byte action, boolean warp_mode)
 {
   int subMainGameLoop;
   int bx;
@@ -155,7 +155,7 @@ locRepeatMainGameLoop:                           // start repeating game loop
 
   // loc_g_186F:
 
-  subProcessKeyboardInput();                 // Check keyboard, act on keys
+  subProcessKeyboardInput(action);             // Check keyboard, act on keys
 
   // 'HACK:
   //  TimerVar = TimerVar + 1
@@ -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 ...
@@ -319,6 +326,8 @@ locExitMainGameLoop:
   return subMainGameLoop;
 } // subMainGameLoop
 
+#if 0
+
 int subMainGameLoop()
 {
   int subMainGameLoop;
@@ -548,6 +557,8 @@ locExitMainGameLoop:
   return subMainGameLoop;
 } // subMainGameLoop
 
+#endif
+
 void subUpdatePlayingTime()
 {
 }