From f49284d47ce80f6a49b51b2ed437b4265da1c26e Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Sun, 22 Sep 2019 23:55:45 +0200 Subject: [PATCH] - made Blood start again by commenting out the fade functions which somehow broke during the CMake transition. --- source/CMakeLists.txt | 2 +- source/blood/src/credits.cpp | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/source/CMakeLists.txt b/source/CMakeLists.txt index b8fa9b522..91cf820a4 100644 --- a/source/CMakeLists.txt +++ b/source/CMakeLists.txt @@ -492,7 +492,7 @@ endif() # Update gitinfo.h add_custom_target( revision_check ALL - COMMAND updaterevision src/gitinfo.h + COMMAND updaterevision source/gitinfo.h WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} DEPENDS updaterevision ) diff --git a/source/blood/src/credits.cpp b/source/blood/src/credits.cpp index eb490e5eb..e07bedbe5 100644 --- a/source/blood/src/credits.cpp +++ b/source/blood/src/credits.cpp @@ -61,6 +61,7 @@ char Wait(int nTicks) char DoFade(char r, char g, char b, int nTicks) { +#if 0 dassert(nTicks > 0); scrSetupFade(r, g, b); totalclock = gFrameClock = 0; @@ -73,11 +74,13 @@ char DoFade(char r, char g, char b, int nTicks) if (keyGetScan()) return 0; } while (totalclock <= nTicks); +#endif return 1; } char DoUnFade(int nTicks) { +#if 0 dassert(nTicks > 0); scrSetupUnfade(); totalclock = gFrameClock = 0; @@ -89,6 +92,7 @@ char DoUnFade(int nTicks) if (keyGetScan()) return 0; } while (totalclock <= nTicks); +#endif return 1; }