zdoom/raze-gles
0
0
Fork 0
mirror of https://github.com/ZDoom/raze-gles.git synced 2024-12-24 10:40:46 +00:00
Code Issues Projects Releases Packages Wiki Activity

- made Blood start again by commenting out the fade functions which somehow broke during the CMake transition.

Browse source
This commit is contained in:
Christoph Oelckers 2019-09-22 23:55:45 +02:00
parent 2cbe211e7c
commit f49284d47c
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
source/CMakeLists.txt
View file

@ -492,7 +492,7 @@ endif()
# Update gitinfo.h # Update gitinfo.h
add_custom_target( revision_check ALL add_custom_target( revision_check ALL
COMMAND updaterevision src/gitinfo.h COMMAND updaterevision source/gitinfo.h
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}
DEPENDS updaterevision ) DEPENDS updaterevision )

4
source/blood/src/credits.cpp
View file

@ -61,6 +61,7 @@ char Wait(int nTicks)
char DoFade(char r, char g, char b, int nTicks) char DoFade(char r, char g, char b, int nTicks)
{ {
#if 0
dassert(nTicks > 0); dassert(nTicks > 0);
scrSetupFade(r, g, b); scrSetupFade(r, g, b);
totalclock = gFrameClock = 0; totalclock = gFrameClock = 0;
@ -73,11 +74,13 @@ char DoFade(char r, char g, char b, int nTicks)
if (keyGetScan()) if (keyGetScan())
return 0; return 0;
} while (totalclock <= nTicks); } while (totalclock <= nTicks);
#endif
return 1; return 1;
} }
char DoUnFade(int nTicks) char DoUnFade(int nTicks)
{ {
#if 0
dassert(nTicks > 0); dassert(nTicks > 0);
scrSetupUnfade(); scrSetupUnfade();
totalclock = gFrameClock = 0; totalclock = gFrameClock = 0;
@ -89,6 +92,7 @@ char DoUnFade(int nTicks)
if (keyGetScan()) if (keyGetScan())
return 0; return 0;
} while (totalclock <= nTicks); } while (totalclock <= nTicks);
#endif
return 1; return 1;
} }