From 20cfbc17866d375624d55c02f0fdf70693bf7c55 Mon Sep 17 00:00:00 2001
From: sirlemonhead <sirlemonhead@outlook.com>
Date: Tue, 10 Mar 2020 00:38:33 +0000
Subject: [PATCH] PCExhumed: Fix the timing of credits text when not using CD
 audio.

# Conflicts:
#	source/exhumed/src/exhumed.cpp
---
 source/exhumed/src/exhumed.cpp |  9 ++++---
 source/exhumed/src/menu.cpp    | 47 ++++++++++++----------------------
 source/exhumed/src/menu.h      |  2 +-
 3 files changed, 22 insertions(+), 36 deletions(-)

diff --git a/source/exhumed/src/exhumed.cpp b/source/exhumed/src/exhumed.cpp
index 15db09f81..5d8349a51 100644
--- a/source/exhumed/src/exhumed.cpp
+++ b/source/exhumed/src/exhumed.cpp
@@ -1233,7 +1233,7 @@ void DoCredits()
 
     playCDtrack(19, false);
 
-    int var_20 = 0;
+    int nSecretSkipKeyCount = 0;
 
     if (videoGetRenderMode() == REND_CLASSIC)
     FadeOut(0);
@@ -1271,14 +1271,14 @@ void DoCredits()
 
         while ((int)totalclock <= nDuration)
         {
-            handleevents();
+            HandleAsync();
 			if(inputState.GetKeyStatus(sc_F12))
             {
-                var_20++;
+                nSecretSkipKeyCount++;
 
 				inputState.ClearKeyStatus(sc_F12);
 
-                if (var_20 > 5) {
+                if (nSecretSkipKeyCount > 5) {
                     return;
                 }
             }
@@ -1290,6 +1290,7 @@ void DoCredits()
 
     while (CDplaying())
     {
+		HandleAsync();
 		inputState.keyGetChar();
     }
 
diff --git a/source/exhumed/src/menu.cpp b/source/exhumed/src/menu.cpp
index ff4bba5cb..05de2deb8 100644
--- a/source/exhumed/src/menu.cpp
+++ b/source/exhumed/src/menu.cpp
@@ -1119,26 +1119,26 @@ void ReadyCinemaText(uint16_t nVal)
     ComputeCinemaText(line);
 }
 
-uint8_t AdvanceCinemaText()
+bool AdvanceCinemaText()
 {
-    int tmp = nHeight + nCrawlY > 0;
+    bool bDoText = nHeight + nCrawlY > 0;
 
-    if (tmp || CDplaying())
+    if (bDoText || CDplaying())
     {
-        nextclock = (int)totalclock + 14;
+        nextclock = (int)totalclock + 15; // NOTE: Value was 14 in original code but seems a touch too fast now
 
-        if (tmp > 0)
+        if (bDoText)
         {
             short y = nCrawlY;
-            int edi = 0;
+            int i = 0;
 
-            while (edi < linecount && y <= 199)
+            while (i < linecount && y <= 199)
             {
                 if (y >= -10) {
-                    myprintext(nLeft[edi], y, gString[line + edi], 0);
+                    myprintext(nLeft[i], y, gString[line + i], 0);
                 }
 
-                edi++;
+                i++;
                 y += 10;
             }
 
@@ -1154,44 +1154,29 @@ uint8_t AdvanceCinemaText()
                 break;
             }
 
-            if (CDplaying())
-            {
-                if (nextclock <= (int)totalclock) {
-                    return kTrue;
-                }
-            }
-            else
-            {
-                return kTrue;
+            if (nextclock <= (int)totalclock) {
+                return true;
             }
         }
     }
 
-    return kFalse;
+    return false;
 }
 
 void DoCinemaText(short nVal)
 {
     ReadyCinemaText(nVal);
 
-    while (1)
+    bool bContinue = true;
+
+    while (bContinue)
     {
         overwritesprite(0, 0, cinematile, 0, 2, kPalNormal);
 
-        uint8_t bContinue = AdvanceCinemaText();
+        bContinue = AdvanceCinemaText();
 
         WaitVBL();
         videoNextPage();
-
-        // TEMP
-        int time = (int)totalclock + 4;
-        while ((int)totalclock < time) {
-            HandleAsync();
-        }
-
-        if (!bContinue) {
-            return;
-        }
     }
 }
 
diff --git a/source/exhumed/src/menu.h b/source/exhumed/src/menu.h
index fe13184f1..b5e759e5b 100644
--- a/source/exhumed/src/menu.h
+++ b/source/exhumed/src/menu.h
@@ -67,7 +67,7 @@ int LoadCinemaPalette(int nPal);
 void CinemaFadeIn();
 
 void ReadyCinemaText(uint16_t nVal);
-uint8_t AdvanceCinemaText();
+bool AdvanceCinemaText();
 
 void DoFailedFinalScene();