mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-07-09 05:23:15 -04:00
Code Issues Packages Projects Releases Wiki Activity

Don't check for alarm reaching its time limit unless it's active

Browse Source
This commit is contained in:
Ryan Dwyer
2022-11-16 08:23:05 +10:00
parent c45e54d5dd
commit 44a3dc48e5
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/game/propobj.c
+8 -6
View File
@@ -18000,6 +18000,7 @@ Gfx *countdownTimerRender(Gfx *gdl)
void alarmTick(void)
{
if (alarmIsActive()) {
s32 limit;
s16 sound;
// These sounds are alarm sounds.
@@ -18043,13 +18044,14 @@ void alarmTick(void)
}
g_AlarmTimer += g_Vars.lvupdate60;
}
// For G5, stop alarm after 55 seconds.
// For all other levels, stop alarm after 30 seconds.
if ((g_AlarmTimer > TICKS(1800) && mainGetStageNum() != STAGE_G5BUILDING)
|| (g_AlarmTimer > TICKS(3300) && mainGetStageNum() == STAGE_G5BUILDING)) {
alarmDeactivate();
// For G5, stop alarm after 55 seconds.
// For all other levels, stop alarm after 30 seconds.
limit = g_Vars.stagenum == STAGE_G5BUILDING ? 3300 : 1800;
if (g_AlarmTimer > limit) {
alarmDeactivate();
}
}
countdownTimerTick();