- cleaned out some waiting code.

There's still too many loops but this at least gets rid of the empty ones.

source/exhumed/src/cd.cpp

@@ -53,10 +53,6 @@ bool playCDtrack(int nTrack, bool bLoop)
     return true;
 }
 
-void StartfadeCDaudio()
-{
-}
-
 int StepFadeCDaudio()
 {
     if (!CDplaying()) {
@@ -82,18 +78,7 @@ void FadeSong()
 
 int fadecdaudio()
 {
-    StartfadeCDaudio();
-
-    while (1)
-    {
-        if (!StepFadeCDaudio()) {
-            return 1;
-        }
-        else {
-            WaitTicks(1);
-        }
-    }
-
+    Mus_Stop();
     return 1;
 }
 

source/exhumed/src/engine.h

@@ -49,7 +49,6 @@ void resettiming();
 // cd
 
 bool playCDtrack(int nTrack, bool bLoop);
-void StartfadeCDaudio();
 int StepFadeCDaudio();
 bool CDplaying();
 void StopCD();

source/exhumed/src/exhumed.cpp

@@ -1156,7 +1156,7 @@ void FinishLevel()
         EraseScreen(4);
         PlayLocalSound(StaticSound[59], 0, true, CHANF_UI);
         videoNextPage();
-        WaitTicks(12);
+        //WaitTicks(12);
         WaitVBL();
         DrawView(65536);
         videoNextPage();
@@ -2061,7 +2061,7 @@ void DoGameOverScene()
     videoNextPage();
     CinemaFadeIn();
     PlayGameOverSound();
-    WaitAnyKey(3);
+    //WaitAnyKey(3);
     FadeOut(0);
 }
 

source/exhumed/src/exhumed.h

@@ -134,8 +134,6 @@ void RestorePalette();
 
 int FindGString(const char *str);
 
-void WaitTicks(int nTicks);
-
 void FadeIn();
 void FadeOut(int bFadeMusic);
 

source/exhumed/src/input.cpp

@@ -146,62 +146,4 @@ void UpdateInputs()
     }
 }
 
-/*
-ClearSpaceBar_
-    GetLocalInput_
-    GetModemInput_
-    BackupInput_
-    SendInput_
-    SendToUnAckd_
-    LogoffPlayer_
-    UpdateInputs_
-    faketimerhandler_
-*/
-
-void WaitNoKey(int nSecs, void (*pFunc) (void))
-{
-    int nTotalTime = (kTimerTicks * nSecs) + (int)totalclock;
-
-    while (nTotalTime > (int)totalclock)
-    {
-        HandleAsync();
-        if (pFunc) {
-            pFunc();
-        }
-    }
-}
-
-int WaitAnyKey(int nSecs)
-{
-    int nTotalTime = (int)totalclock + (kTimerTicks * nSecs);
-
-    while (1)
-    {
-        HandleAsync();
-        if (nTotalTime <= (int)totalclock || nSecs == -1) {
-            return -1;
-        }
-		if (inputState.CheckAllInput()) return 1;
-    }
-}
-
-
-/*
-    Name:  _nLocalPlayer
-  Name:  _nNetPlayerCount
-  Name:  _nModemPlayer
-  Name:  _nNetMoves
-  Name:  _lLocalButtons
-  Name:  _lLocalCodes
-  Name:  _nInputStack
-  Name:  _bSyncNet
-  Name:  _lStartupTime
-  Name:  _bStackNode
-  Name:  _sSync
-  Name:  _nTypeStack
-  Name:  _sPlayerInput
-  Name:  _pStackPtr
-  Name:  _sInputStack
-
-  */
   END_PS_NS

source/exhumed/src/light.cpp

@@ -164,22 +164,6 @@ void RestorePalette()
     videoTintBlood(0, 0, 0);
 }
 
-void WaitTicks(int nTicks)
-{
-    if (htimer)
-    {
-        nTicks += (int)totalclock;
-        while (nTicks > (int)totalclock) { HandleAsync(); }
-    }
-    else
-    {
-        while (nTicks > 0) {
-            nTicks--;
-            WaitVBL();
-        }
-    }
-}
-
 void FadeToWhite()
 {
     // fixme
@@ -189,18 +173,10 @@ void FadeToWhite()
 
 void FadeOut(int bFadeMusic)
 {
-    if (bFadeMusic) {
-        StartfadeCDaudio();
-    }
-
-
+    if (bFadeMusic) StopCD();
     videoTintBlood(-255, -255, -255);
     videoNextPage();
 
-    if (bFadeMusic) {
-        while (StepFadeCDaudio() != 0) {}
-    }
-
     EraseScreen(overscanindex);
 }
 

source/exhumed/src/menu.cpp

@@ -404,61 +404,8 @@ void uploadCinemaPalettes()
     }
 }
 
-//int IncrementCinemaFadeIn()
-//{
-//    dest = cinemapal;
-//    cur = curpal;
-//
-//    int ebx = 0;
-//
-//    for (int i = 0; i < 768; i++)
-//    {
-//        ebx++;
-//
-//        if (*cur < *dest)
-//        {
-//            (*cur)++;
-//        }
-//        else if (*cur == *dest)
-//        {
-//            ebx--;
-//        }
-//        else
-//        {
-//            (*cur)--;
-//        }
-//
-//        cur++;
-//        dest++;
-//    }
-//
-//    MySetPalette(curpal);
-//    return ebx;
-//}
-
 void CinemaFadeIn()
 {
-    BlackOut();
-
-#ifdef USE_OPENGL
-    if (videoGetRenderMode() >= REND_POLYMOST)
-    {
-        videoNextPage();
-        return;
-    }
-#endif
-
-    int val;
-
-    do
-    {
-        val = DoFadeIn();
-        WaitTicks(2);
-
-        // need to page flip in each iteration of the loop for non DOS version
-        videoNextPage();
-
-    } while (val > 0);
 }
 
 void ComputeCinemaText(int nLine)
@@ -636,7 +583,7 @@ void GoToTheCinema(int nVal)
     switch (nVal - 1)
     {
         default:
-            WaitAnyKey(10);
+            //WaitAnyKey(10);
             break;
 
         case 0:

source/exhumed/src/ps_input.h

@@ -52,8 +52,6 @@ struct PlayerInput // TODO consider adjusting this for demo compatibility
 };
 
 void InitInput();
-void WaitNoKey(int nSecs, void (*pFunc) (void));
-int WaitAnyKey(int nSecs);
 
 void UpdateInputs();