mpo/VVVVVV
1
0
Fork 0
mirror of https://github.com/TerryCavanagh/VVVVVV.git synced 2024-12-23 01:59:43 +01:00
Code Issues Releases Wiki Activity

Don't tick timer if in time trial countdown

Browse source 
In 2.2 and previous, the game would call resetgameclock() every frame
for the last 30 frames of the time trial countdown in order to make sure
it gets reset. This was in a render function, and didn't get brought out
in 2.3, so 2.3 resets the game clock *while rendering*, which is kinda
bad and is an oversight on my part for not noticing.

Instead of doing that, just add a conditional to the timer so that it
won't tick during the time trial countdown. This fixes #699 even further
by making it so the time trial par can't even be lost during the
countdown, because the timer won't tick up - so you can never get a sad
squeak to play by pausing the game or unfocus-pausing it during the
countdown.
This commit is contained in:
Misa 2021-04-13 14:38:45 -07:00 committed by Ethan Lee
parent 2517900010
commit 01ba834086
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
desktop_version/src/Game.cpp
View file

@ -5683,6 +5683,11 @@ std::string Game::unrescued(void)
void Game::gameclock(void) void Game::gameclock(void)
{ {
if (timetrialcountdown > 0)
{
return;
}
frames++; frames++;
if (frames >= 30) if (frames >= 30)
{ {

1
desktop_version/src/Render.cpp
View file

@ -1769,7 +1769,6 @@ void gamerender(void)
{ {
if (game.timetrialcountdown < 30) if (game.timetrialcountdown < 30)
{ {
game.resetgameclock();
if (int(game.timetrialcountdown / 4) % 2 == 0) graphics.bigprint( -1, 100, "Go!", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 4); if (int(game.timetrialcountdown / 4) % 2 == 0) graphics.bigprint( -1, 100, "Go!", 220 - (help.glow), 220 - (help.glow), 255 - (help.glow / 2), true, 4);
} }
else if (game.timetrialcountdown < 60) else if (game.timetrialcountdown < 60)