zdoom/raze
0
0
Fork 0
mirror of https://github.com/ZDoom/Raze.git synced 2025-06-01 09:42:27 +00:00
Code Issues Projects Releases Packages Wiki Activity

- renamed local totalclock variables to reduce noise for the forthcoming timer cleanup.

Browse source
This commit is contained in:
Christoph Oelckers 2020-08-19 17:23:18 +02:00
parent 91cc6a657b
commit 5cfd427e42
4 changed files with 63 additions and 63 deletions
Download patch file Download diff file Expand all files Collapse all files

12
source/core/screenjob.cpp
View file

@ -95,7 +95,7 @@ class DAnmPlayer : public DScreenJob
int numframes = 0; int numframes = 0;
int curframe = 1; int curframe = 1;
int frametime = 0; int frametime = 0;
int ototalclock = 0; int nextframetime = 0;
AnimTextures animtex; AnimTextures animtex;
const AnimSound* animSnd; const AnimSound* animSnd;
const int* frameTicks; const int* frameTicks;
@ -126,16 +126,16 @@ public:
int Frame(uint64_t clock, bool skiprequest) override int Frame(uint64_t clock, bool skiprequest) override
{ {
int totalclock = int(clock * 120 / 1'000'000'000); int currentclock = int(clock * 120 / 1'000'000'000);
if (curframe > 4 && totalclock > frametime + 60) if (curframe > 4 && currentclock > frametime + 60)
{ {
Printf("WARNING: slowdown in video playback, aborting\n"); Printf("WARNING: slowdown in video playback, aborting\n");
soundEngine->StopAllChannels(); soundEngine->StopAllChannels();
return -1; return -1;
} }
if (totalclock < ototalclock - 1) if (currentclock < nextframetime - 1)
{ {
twod->ClearScreen(); twod->ClearScreen();
DrawTexture(twod, animtex.GetFrame(), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, DTA_Masked, false, TAG_DONE); DrawTexture(twod, animtex.GetFrame(), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, DTA_Masked, false, TAG_DONE);
@ -144,7 +144,7 @@ public:
} }
animtex.SetFrame(ANIM_GetPalette(&anim), ANIM_DrawFrame(&anim, curframe)); animtex.SetFrame(ANIM_GetPalette(&anim), ANIM_DrawFrame(&anim, curframe));
frametime = totalclock; frametime = currentclock;
twod->ClearScreen(); twod->ClearScreen();
DrawTexture(twod, animtex.GetFrame(), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, DTA_Masked, false, TAG_DONE); DrawTexture(twod, animtex.GetFrame(), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, DTA_Masked, false, TAG_DONE);
@ -156,7 +156,7 @@ public:
else if (curframe < numframes - 1) delay = frameTicks[1]; else if (curframe < numframes - 1) delay = frameTicks[1];
else delay = frameTicks[2]; else delay = frameTicks[2];
} }
ototalclock += delay; nextframetime += delay;
if (animSnd) for (int i = 0; animSnd[i].framenum >= 0; i++) if (animSnd) for (int i = 0; animSnd[i].framenum >= 0; i++)
{ {

62
source/games/duke/src/2d_d.cpp
View file

@ -315,7 +315,7 @@ public:
auto translation = TRANSLATION(Translation_BasePalettes, ENDINGPAL); auto translation = TRANSLATION(Translation_BasePalettes, ENDINGPAL);
int totalclock = nsclock * 120 / 1'000'000'000; int currentclock = nsclock * 120 / 1'000'000'000;
uint64_t span = nsclock / 1'000'000; uint64_t span = nsclock / 1'000'000;
@ -325,8 +325,8 @@ public:
// boss // boss
if (totalclock > 390 && totalclock < 780) if (currentclock > 390 && currentclock < 780)
for (int t = 0; t < 35; t += 5) if (bossmove[t + 2] && (totalclock % 390) > bossmove[t] && (totalclock % 390) <= bossmove[t + 1]) for (int t = 0; t < 35; t += 5) if (bossmove[t + 2] && (currentclock % 390) > bossmove[t] && (currentclock % 390) <= bossmove[t + 1])
{ {
if (t == 10 && bonuscnt == 1) if (t == 10 && bonuscnt == 1)
{ {
@ -339,20 +339,20 @@ public:
} }
// Breathe // Breathe
if (totalclock < 450 || totalclock >= 750) if (currentclock < 450 || currentclock >= 750)
{ {
if (totalclock >= 750) if (currentclock >= 750)
{ {
DrawTexture(twod, tileGetTexture(VICTORY1 + 8, true), 86, 59, DTA_FullscreenScale, FSMode_ScaleToFit43, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DrawTexture(twod, tileGetTexture(VICTORY1 + 8, true), 86, 59, DTA_FullscreenScale, FSMode_ScaleToFit43, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200,
DTA_TranslationIndex, translation, DTA_TopLeft, true, TAG_DONE); DTA_TranslationIndex, translation, DTA_TopLeft, true, TAG_DONE);
if (totalclock >= 750 && bonuscnt == 2) if (currentclock >= 750 && bonuscnt == 2)
{ {
S_PlaySound(DUKETALKTOBOSS, CHAN_AUTO, CHANF_UI); S_PlaySound(DUKETALKTOBOSS, CHAN_AUTO, CHANF_UI);
bonuscnt++; bonuscnt++;
} }
} }
for (int t = 0; t < 20; t += 5) for (int t = 0; t < 20; t += 5)
if (breathe[t + 2] && (totalclock % 120) > breathe[t] && (totalclock % 120) <= breathe[t + 1]) if (breathe[t + 2] && (currentclock % 120) > breathe[t] && (currentclock % 120) <= breathe[t + 1])
{ {
if (t == 5 && bonuscnt == 0) if (t == 5 && bonuscnt == 0)
{ {
@ -677,7 +677,7 @@ public:
if (clock == 0) S_PlayBonusMusic(); if (clock == 0) S_PlayBonusMusic();
char tempbuf[32]; char tempbuf[32];
int totalclock = int(clock * 120 / 1'000'000'000); int currentclock = int(clock * 120 / 1'000'000'000);
twod->ClearScreen(); twod->ClearScreen();
DrawTexture(twod, tileGetTexture(MENUSCREEN), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, DTA_Color, 0xff808080, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE); DrawTexture(twod, tileGetTexture(MENUSCREEN), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, DTA_Color, 0xff808080, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
DrawTexture(twod, tileGetTexture(INGAMEDUKETHREEDEE, true), 160, 34, DTA_FullscreenScale, FSMode_ScaleToFit43, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DTA_CenterOffsetRel, true, TAG_DONE); DrawTexture(twod, tileGetTexture(INGAMEDUKETHREEDEE, true), 160, 34, DTA_FullscreenScale, FSMode_ScaleToFit43, DTA_VirtualWidth, 320, DTA_VirtualHeight, 200, DTA_CenterOffsetRel, true, TAG_DONE);
@ -686,7 +686,7 @@ public:
GameText(160, 58 + 2, GStrings("Multiplayer Totals"), 0, 0); GameText(160, 58 + 2, GStrings("Multiplayer Totals"), 0, 0);
GameText(160, 58 + 10, currentLevel->DisplayName(), 0, 0); GameText(160, 58 + 10, currentLevel->DisplayName(), 0, 0);
GameText(160, 165, GStrings("Presskey"), 8 - int(sin(totalclock / 10.) * 8), 0); GameText(160, 165, GStrings("Presskey"), 8 - int(sin(currentclock / 10.) * 8), 0);
int t = 0; int t = 0;
@ -786,7 +786,7 @@ public:
mysnprintf(tempbuf, 32, "%02d:%02d", (time / (26 * 60)) % 60, (time / 26) % 60); mysnprintf(tempbuf, 32, "%02d:%02d", (time / (26 * 60)) % 60, (time / 26) % 60);
} }
void PrintTime(int totalclock) void PrintTime(int currentclock)
{ {
char tempbuf[32]; char tempbuf[32];
GameText(10, 59 + 9, GStrings("TXT_YourTime"), 0); GameText(10, 59 + 9, GStrings("TXT_YourTime"), 0);
@ -797,7 +797,7 @@ public:
if (bonuscnt == 0) if (bonuscnt == 0)
bonuscnt++; bonuscnt++;
if (totalclock > (60 * 4)) if (currentclock > (60 * 4))
{ {
if (bonuscnt == 1) if (bonuscnt == 1)
{ {
@ -818,7 +818,7 @@ public:
} }
} }
void PrintKills(int totalclock) void PrintKills(int currentclock)
{ {
char tempbuf[32]; char tempbuf[32];
GameText(10, 94 + 9, GStrings("TXT_EnemiesKilled"), 0); GameText(10, 94 + 9, GStrings("TXT_EnemiesKilled"), 0);
@ -830,7 +830,7 @@ public:
S_PlaySound(FLY_BY, CHAN_AUTO, CHANF_UI); S_PlaySound(FLY_BY, CHAN_AUTO, CHANF_UI);
} }
if (totalclock > (60 * 7)) if (currentclock > (60 * 7))
{ {
if (bonuscnt == 3) if (bonuscnt == 3)
{ {
@ -854,14 +854,14 @@ public:
} }
} }
void PrintSecrets(int totalclock) void PrintSecrets(int currentclock)
{ {
char tempbuf[32]; char tempbuf[32];
GameText(10, 120 + 9, GStrings("TXT_SECFND"), 0); GameText(10, 120 + 9, GStrings("TXT_SECFND"), 0);
GameText(10, 130 + 9, GStrings("TXT_SECMISS"), 0); GameText(10, 130 + 9, GStrings("TXT_SECMISS"), 0);
if (bonuscnt == 4) bonuscnt++; if (bonuscnt == 4) bonuscnt++;
if (totalclock > (60 * 10)) if (currentclock > (60 * 10))
{ {
if (bonuscnt == 5) if (bonuscnt == 5)
{ {
@ -881,29 +881,29 @@ public:
{ {
if (clock == 0) S_PlayBonusMusic(); if (clock == 0) S_PlayBonusMusic();
twod->ClearScreen(); twod->ClearScreen();
int totalclock = int(clock * 120 / 1'000'000'000); int currentclock = int(clock * 120 / 1'000'000'000);
DrawTexture(twod, tileGetTexture(gfx_offset, true), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE); DrawTexture(twod, tileGetTexture(gfx_offset, true), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
if (lastmapname) BigText(160, 20 - 6, lastmapname); if (lastmapname) BigText(160, 20 - 6, lastmapname);
BigText(160, 36 - 6, GStrings("Completed")); BigText(160, 36 - 6, GStrings("Completed"));
GameText(160, 190, GStrings("PRESSKEY"), 8 - int(sin(totalclock / 10.) * 8), 0); GameText(160, 190, GStrings("PRESSKEY"), 8 - int(sin(currentclock / 10.) * 8), 0);
if (totalclock > (60 * 3)) if (currentclock > (60 * 3))
{ {
PrintTime(totalclock); PrintTime(currentclock);
} }
if (totalclock > (60 * 6)) if (currentclock > (60 * 6))
{ {
PrintKills(totalclock); PrintKills(currentclock);
} }
if (totalclock > (60 * 9)) if (currentclock > (60 * 9))
{ {
PrintSecrets(totalclock); PrintSecrets(currentclock);
} }
if (totalclock >= (1000000000L) && totalclock < (1000000320L)) if (currentclock >= (1000000000L) && currentclock < (1000000320L))
{ {
switch ((totalclock >> 4) % 15) switch ((currentclock >> 4) % 15)
{ {
case 0: case 0:
if (bonuscnt == 6) if (bonuscnt == 6)
@ -924,10 +924,10 @@ public:
break; break;
} }
} }
else if (totalclock > (10240 + 120L)) return 0; else if (currentclock > (10240 + 120L)) return 0;
else else
{ {
switch((totalclock >> 5) & 3) switch((currentclock >> 5) & 3)
{ {
case 1: case 1:
case 3: case 3:
@ -939,17 +939,17 @@ public:
} }
} }
if (totalclock > 10240 && totalclock < 10240 + 10240) if (currentclock > 10240 && currentclock < 10240 + 10240)
SetTotalClock(1024); SetTotalClock(1024);
if (skiprequest && totalclock > (60 * 2)) if (skiprequest && currentclock > (60 * 2))
{ {
skiprequest = false; skiprequest = false;
if (totalclock < (60 * 13)) if (currentclock < (60 * 13))
{ {
SetTotalClock(60 * 13); SetTotalClock(60 * 13);
} }
else if (totalclock < (1000000000)) else if (currentclock < (1000000000))
{ {
// force-set bonuscnt here so that it won't desync with the rest of the logic and Duke's voice can be heard. // force-set bonuscnt here so that it won't desync with the rest of the logic and Duke's voice can be heard.
if (bonuscnt < 6) bonuscnt = 6; if (bonuscnt < 6) bonuscnt = 6;

46
source/games/duke/src/2d_r.cpp
View file

@ -383,7 +383,7 @@ public:
mysnprintf(tempbuf, 32, "%02d:%02d", (time / (26 * 60)) % 60, (time / 26) % 60); mysnprintf(tempbuf, 32, "%02d:%02d", (time / (26 * 60)) % 60, (time / 26) % 60);
} }
void PrintTime(int totalclock) void PrintTime(int currentclock)
{ {
char tempbuf[32]; char tempbuf[32];
BigText(30, 48, GStrings("TXT_YerTime"), -1); BigText(30, 48, GStrings("TXT_YerTime"), -1);
@ -393,7 +393,7 @@ public:
if (bonuscnt == 0) if (bonuscnt == 0)
bonuscnt++; bonuscnt++;
if (totalclock > (60 * 4)) if (currentclock > (60 * 4))
{ {
if (bonuscnt == 1) if (bonuscnt == 1)
{ {
@ -414,7 +414,7 @@ public:
} }
} }
void PrintKills(int totalclock) void PrintKills(int currentclock)
{ {
char tempbuf[32]; char tempbuf[32];
BigText(30, 112, GStrings("TXT_VarmintsKilled"), -1); BigText(30, 112, GStrings("TXT_VarmintsKilled"), -1);
@ -423,7 +423,7 @@ public:
if (bonuscnt == 2) if (bonuscnt == 2)
bonuscnt++; bonuscnt++;
if (totalclock > (60 * 7)) if (currentclock > (60 * 7))
{ {
if (bonuscnt == 3) if (bonuscnt == 3)
{ {
@ -447,14 +447,14 @@ public:
} }
} }
void PrintSecrets(int totalclock) void PrintSecrets(int currentclock)
{ {
char tempbuf[32]; char tempbuf[32];
BigText(30, 144, GStrings("TXT_SECFND"), -1); BigText(30, 144, GStrings("TXT_SECFND"), -1);
BigText(30, 160, GStrings("TXT_SECMISS"), -1); BigText(30, 160, GStrings("TXT_SECMISS"), -1);
if (bonuscnt == 4) bonuscnt++; if (bonuscnt == 4) bonuscnt++;
if (totalclock > (60 * 10)) if (currentclock > (60 * 10))
{ {
if (bonuscnt == 5) if (bonuscnt == 5)
{ {
@ -474,28 +474,28 @@ public:
{ {
if (clock == 0) S_PlayBonusMusic(); if (clock == 0) S_PlayBonusMusic();
twod->ClearScreen(); twod->ClearScreen();
int totalclock = int(clock * 120 / 1'000'000'000); int currentclock = int(clock * 120 / 1'000'000'000);
DrawTexture(twod, tileGetTexture(gfx_offset, true), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE); DrawTexture(twod, tileGetTexture(gfx_offset, true), 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, DTA_LegacyRenderStyle, STYLE_Normal, TAG_DONE);
if (lastmapname) BigText(80, 16, lastmapname, -1); if (lastmapname) BigText(80, 16, lastmapname, -1);
BigText(15, 192, GStrings("PRESSKEY"), -1); BigText(15, 192, GStrings("PRESSKEY"), -1);
if (totalclock > (60 * 3)) if (currentclock > (60 * 3))
{ {
PrintTime(totalclock); PrintTime(currentclock);
} }
if (totalclock > (60 * 6)) if (currentclock > (60 * 6))
{ {
PrintKills(totalclock); PrintKills(currentclock);
} }
if (totalclock > (60 * 9)) if (currentclock > (60 * 9))
{ {
PrintSecrets(totalclock); PrintSecrets(currentclock);
} }
if (totalclock > (1000000000L) && totalclock < (1000000320L)) if (currentclock > (1000000000L) && currentclock < (1000000320L))
{ {
int val = (totalclock >> 4) % 15; int val = (currentclock >> 4) % 15;
if (val == 0) if (val == 0)
{ {
if (bonuscnt == 6) if (bonuscnt == 6)
@ -506,19 +506,19 @@ public:
} }
} }
} }
else if (totalclock > (10240 + 120L)) return 0; else if (currentclock > (10240 + 120L)) return 0;
if (totalclock > 10240 && totalclock < 10240 + 10240) if (currentclock > 10240 && currentclock < 10240 + 10240)
SetTotalClock(1024); SetTotalClock(1024);
if (skiprequest && totalclock > (60 * 2)) if (skiprequest && currentclock > (60 * 2))
{ {
skiprequest = false; skiprequest = false;
if (totalclock < (60 * 13)) if (currentclock < (60 * 13))
{ {
SetTotalClock(60 * 13); SetTotalClock(60 * 13);
} }
else if (totalclock < (1000000000)) else if (currentclock < (1000000000))
SetTotalClock(1000000000); SetTotalClock(1000000000);
} }
@ -537,10 +537,10 @@ public:
} }
int Frame(uint64_t clock, bool skiprequest) int Frame(uint64_t clock, bool skiprequest)
{ {
int totalclock = int(clock * 120 / 1'000'000'000); int currentclock = int(clock * 120 / 1'000'000'000);
auto tex = tileGetTexture(RRTILE8677 + ((totalclock >> 4) & 1)); auto tex = tileGetTexture(RRTILE8677 + ((currentclock >> 4) & 1));
DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, TAG_DONE); DrawTexture(twod, tex, 0, 0, DTA_FullscreenEx, FSMode_ScaleToFit43, TAG_DONE);
if (!S_CheckSoundPlaying(-1, 35) && totalclock > 15*120) return 0; // make sure it stays, even if sound is off. if (!S_CheckSoundPlaying(-1, 35) && currentclock > 15*120) return 0; // make sure it stays, even if sound is off.
if (skiprequest) if (skiprequest)
{ {
S_StopSound(35); S_StopSound(35);

6
source/sw/src/2d.cpp
View file

@ -381,7 +381,7 @@ private:
int Frame(uint64_t clock, bool skiprequest) int Frame(uint64_t clock, bool skiprequest)
{ {
twod->ClearScreen(); twod->ClearScreen();
int totalclock = int(clock * 120 / 1'000'000'000); int currentclock = int(clock * 120 / 1'000'000'000);
if (clock == 0) if (clock == 0)
{ {
@ -393,11 +393,11 @@ private:
State = s_BonusAnim[STD_RANDOM_RANGE(countof(s_BonusAnim))]; State = s_BonusAnim[STD_RANDOM_RANGE(countof(s_BonusAnim))];
Tics = 0; Tics = 0;
skiprequest = false; skiprequest = false;
nextclock = totalclock; nextclock = currentclock;
} }
else else
{ {
while (totalclock > nextclock) while (currentclock > nextclock)
{ {
nextclock += synctics; nextclock += synctics;
gStateControl(&State, &Tics); gStateControl(&State, &Tics);