X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fgame_sp%2FMainGameLoop.c;h=e1f81f4ddedf7d1e953beaabfdc1c67c1d63a066;hb=3c080c7b33b6dfcc6e0039b592c5f268535873e7;hp=79f1ec9c6fbbffbe633f119e9ee2b52b946f2dd4;hpb=055b582fdcaeddfa6dbb240eb591ec61f37e21d3;p=rocksndiamonds.git diff --git a/src/game_sp/MainGameLoop.c b/src/game_sp/MainGameLoop.c index 79f1ec9c..e1f81f4d 100644 --- a/src/game_sp/MainGameLoop.c +++ b/src/game_sp/MainGameLoop.c @@ -35,7 +35,7 @@ int subMainGameLoop_Init() if (DemoFlag != 0) { -#if 1 +#if 0 printf("::: playing demo ...\n"); #endif @@ -45,7 +45,7 @@ int subMainGameLoop_Init() } else // loc_g_1836: { -#if 1 +#if 0 printf("::: playing game ...\n"); #endif @@ -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 @@ -236,9 +236,13 @@ locRepeatMainGameLoop: // start repeating game loop { // happens when demo ends or when Murphy enters exit (to be checked) +#if 0 printf("::: ExitToMenuFlag == True\n"); +#endif +#if 0 goto locExitMainGameLoop; +#endif } #else if (ExitToMenuFlag == 1) @@ -257,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; @@ -274,6 +283,14 @@ locExitMainGameLoop: printf("::: locExitMainGameLoop reached [%d]\n", LeadOutCounter); #endif + + +#if 1 + return subMainGameLoop; +#endif + + + do { DoEvents(); // user may klick on menus or move the window here ... @@ -306,10 +323,11 @@ locExitMainGameLoop: if (UpdatedFlag == 0) // update playing time subUpdatePlayingTime(); - return subMainGameLoop; } // subMainGameLoop +#if 0 + int subMainGameLoop() { int subMainGameLoop; @@ -539,6 +557,8 @@ locExitMainGameLoop: return subMainGameLoop; } // subMainGameLoop +#endif + void subUpdatePlayingTime() { }