From b4df1fd662810ff64f1271d27b34ab83144abbe5 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Wed, 26 Aug 2020 22:22:46 +0200 Subject: [PATCH] - fixed Ramses text display. Fixes #265. --- source/exhumed/src/ramses.cpp | 2 +- source/exhumed/src/view.cpp | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/source/exhumed/src/ramses.cpp b/source/exhumed/src/ramses.cpp index bceae1f51..d686db85b 100644 --- a/source/exhumed/src/ramses.cpp +++ b/source/exhumed/src/ramses.cpp @@ -147,7 +147,7 @@ void InitSpiritHead() nTrack = 7; } - bSubTitles = playCDtrack(nTrack, false) == 0; + playCDtrack(nTrack, false); StartSwirlies(); diff --git a/source/exhumed/src/view.cpp b/source/exhumed/src/view.cpp index f2f32bdda..246bed98b 100644 --- a/source/exhumed/src/view.cpp +++ b/source/exhumed/src/view.cpp @@ -434,22 +434,24 @@ void DrawView(double smoothRatio, bool sceneonly) { subtitleOverlay.Start(gameclock); if (currentLevel->levelNumber == 1) - subtitleOverlay.ReadyCinemaText(1); + subtitleOverlay.ReadyCinemaText(0); else - subtitleOverlay.ReadyCinemaText(5); + subtitleOverlay.ReadyCinemaText(4); } + inputState.ClearAllInput(); } - else if (nHeadStage == 6) + else if (nHeadStage == 5) { if ((bSubTitles && !subtitleOverlay.AdvanceCinemaText(gameclock)) || inputState.CheckAllInput()) { - inputState.ClearAllInput(); + inputState.ClearAllInput(); EndLevel = 2; if (CDplaying()) { fadecdaudio(); } } + else subtitleOverlay.DisplayText(); } } }