mirror/perfect-dark
1
0
Fork 0
mirror of https://gitlab.com/ryandwyer/perfect-dark synced 2026-08-09 02:26:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Rename PALDOWN macro to TICKS

Browse Source
This commit is contained in:
Ryan Dwyer
2022-03-10 21:22:05 +10:00
parent 960baf33a8
commit f9fbf288f8
49 changed files with 350 additions and 350 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/lib/joy.c
+1 -1
View File
@@ -344,7 +344,7 @@ void joyDisableTemporarily(void)
s32 i;
for (i = 0; i < 4; i++) {
g_JoyDisableCooldown[i] = PALDOWN(60);
g_JoyDisableCooldown[i] = TICKS(60);
}
}
src/lib/music.c
+2 -2
View File
@@ -1049,7 +1049,7 @@ void musicTick(void)
// then start a 2 second time before starting the new one.
g_MusicAge60 = 0;
musicQueueFadeEvent(TRACKTYPE_PRIMARY, 2, 1);
g_MusicSilenceTimer60 = PALDOWN(120);
g_MusicSilenceTimer60 = TICKS(120);
}
if (g_MpEnableMusicSwitching && g_Vars.normmplayerisrunning) {
@@ -1126,7 +1126,7 @@ void musicTick(void)
// Check if the player is in an ambient room every 0.25 seconds
if (g_Vars.lvupdate240 > g_MusicNextAmbientTick240) {
musicTickAmbient();
g_MusicNextAmbientTick240 = PALDOWN(60);
g_MusicNextAmbientTick240 = TICKS(60);
} else {
g_MusicNextAmbientTick240 -= g_Vars.lvupdate240;
}
src/lib/snd.c
+3 -3
View File
@@ -2167,7 +2167,7 @@ void sndTick(void)
switch (g_SndCurMp3.responsetype) {
case MP3RESPONSETYPE_ACKNOWLEDGE:
case MP3RESPONSETYPE_WHISPER:
g_SndCurMp3.responsetimer240 = PALDOWN(60);
g_SndCurMp3.responsetimer240 = TICKS(60);
break;
case MP3RESPONSETYPE_GREETING:
g_SndCurMp3.responsetimer240 = 1;
@@ -2573,7 +2573,7 @@ void sndStartMp3(s16 soundnum, s32 arg1, s32 arg2, s32 arg3)
void sndPlayNosedive(s32 seconds)
{
g_SndNosediveDuration240 = seconds * PALDOWN(240);
g_SndNosediveDuration240 = seconds * TICKS(240);
g_SndNosediveAge240 = 0;
g_SndNosediveVolume = 0;
g_SndNosediveHandle = NULL;
@@ -2653,7 +2653,7 @@ void sndTickNosedive(void)
void sndPlayUfo(s32 seconds)
{
g_SndUfoDuration240 = seconds * PALDOWN(240);
g_SndUfoDuration240 = seconds * TICKS(240);
g_SndUfoAge240 = 0;
g_SndUfoVolume = 0;
g_SndUfoHandle = NULL;