Skip to content

Commit 96d93d9

Browse files
AbitTheGrayAbitTheGray
committed
Use TICRATE instead of 35 when converting to/from real time
1 parent eb5b67b commit 96d93d9

29 files changed

+90
-89
lines changed

‎prboom2/src/d_main.c‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -736,7 +736,7 @@ void D_SetPage(const char* name, int tics, int music)
736736

737737
static void D_DrawTitle1(const char *name)
738738
{
739-
D_SetPage(name, TICRATE * 170 / 35, mus_intro);
739+
D_SetPage(name, TICRATE * 170 / 35, mus_intro); // 35 * 170 / 35, is that correct math?
740740
}
741741

742742
static void D_DrawTitle2(const char *name)

‎prboom2/src/dsda.c‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -222,17 +222,17 @@ void dsda_DisplayNotifications(void) {
222222
}
223223

224224
void dsda_DecomposeILTime(dsda_level_time_t* level_time) {
225-
level_time->m = dsda_last_leveltime / 35 / 60;
226-
level_time->s = (dsda_last_leveltime % (60 * 35)) / 35;
227-
level_time->t = round(100.f * (dsda_last_leveltime % 35) / 35);
225+
level_time->m = dsda_last_leveltime / TICRATE / 60;
226+
level_time->s = (dsda_last_leveltime % (60 * TICRATE)) / TICRATE;
227+
level_time->t = round(100.f * (dsda_last_leveltime % TICRATE) / TICRATE);
228228
}
229229

230230
void dsda_DecomposeMovieTime(dsda_movie_time_t* total_time) {
231231
extern int totalleveltimes;
232232

233-
total_time->h = totalleveltimes / 35 / 60 / 60;
234-
total_time->m = (totalleveltimes % (60 * 60 * 35)) / 35 / 60;
235-
total_time->s = (totalleveltimes % (60 * 35)) / 35;
233+
total_time->h = totalleveltimes / TICRATE / 60 / 60;
234+
total_time->m = (totalleveltimes % (60 * 60 * TICRATE)) / TICRATE / 60;
235+
total_time->s = (totalleveltimes % (60 * TICRATE)) / TICRATE;
236236
}
237237

238238
void dsda_DisplayNotification(const char* msg) {

‎prboom2/src/dsda/ambient.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ void dsda_UpdateAmbientSource(ambient_source_t* source) {
6868

6969
// looping
7070
if (source->data.min_tics < 0) {
71-
source->wait_tics = 35;
71+
source->wait_tics = TICRATE;
7272

7373
if (!source->data.attenuation) {
7474
S_AdjustVolume(source->data.volume);
@@ -146,13 +146,13 @@ static void dsda_ParseAmbient(Scanner &scanner) {
146146
}
147147
else if (scanner.StringMatch("random")) {
148148
scanner.MustGetFloat();
149-
amb_sfx.min_tics = 35 * scanner.decimal;
149+
amb_sfx.min_tics = TICRATE * scanner.decimal;
150150
scanner.MustGetFloat();
151-
amb_sfx.max_tics = 35 * scanner.decimal;
151+
amb_sfx.max_tics = TICRATE * scanner.decimal;
152152
}
153153
else if (scanner.StringMatch("periodic")) {
154154
scanner.MustGetFloat();
155-
amb_sfx.min_tics = 35 * scanner.decimal;
155+
amb_sfx.min_tics = TICRATE * scanner.decimal;
156156
amb_sfx.max_tics = amb_sfx.min_tics;
157157
}
158158

‎prboom2/src/dsda/hud_components/composite_time.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,11 +43,11 @@ static void dsda_UpdateComponentText(char* str, size_t max_size) {
4343
"%s%s%d:%02d %s%d:%05.2f ",
4444
local->label,
4545
dsda_TextColor(dsda_tc_exhud_total_time),
46-
total_time / 35 / 60,
47-
(total_time % (60 * 35)) / 35,
46+
total_time / TICRATE / 60,
47+
(total_time % (60 * TICRATE)) / TICRATE,
4848
dsda_TextColor(dsda_tc_exhud_level_time),
49-
leveltime / 35 / 60,
50-
(float) (leveltime % (60 * 35)) / 35
49+
leveltime / TICRATE / 60,
50+
(float) (leveltime % (60 * TICRATE)) / TICRATE
5151
);
5252
else
5353
length = snprintf(
@@ -56,8 +56,8 @@ static void dsda_UpdateComponentText(char* str, size_t max_size) {
5656
"%s%s%d:%05.2f ",
5757
local->label,
5858
dsda_TextColor(dsda_tc_exhud_level_time),
59-
leveltime / 35 / 60,
60-
(float) (leveltime % (60 * 35)) / 35
59+
leveltime / TICRATE / 60,
60+
(float) (leveltime % (60 * TICRATE)) / TICRATE
6161
);
6262

6363
if (dsda_reborn && (demorecording || demoplayback)) {
@@ -68,8 +68,8 @@ static void dsda_UpdateComponentText(char* str, size_t max_size) {
6868
max_size - length,
6969
"%s%d:%02d ",
7070
dsda_TextColor(dsda_tc_exhud_demo_length),
71-
demo_tic / 35 / 60,
72-
(demo_tic % (60 * 35)) / 35
71+
demo_tic / TICRATE / 60,
72+
(demo_tic % (60 * TICRATE)) / TICRATE
7373
);
7474
}
7575
}

‎prboom2/src/dsda/hud_components/event_split.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,8 +68,8 @@ void dsda_AddSplit(dsda_split_class_t split_class, int lifetime) {
6868
ticks = lifetime;
6969

7070
// To match the timer, we use the leveltime value at the end of the frame
71-
minutes = (leveltime + 1) / 35 / 60;
72-
seconds = (float)((leveltime + 1) % (60 * 35)) / 35;
71+
minutes = (leveltime + 1) / TICRATE / 60;
72+
seconds = (float)((leveltime + 1) % (60 * TICRATE)) / TICRATE;
7373
snprintf(
7474
local->component.msg, sizeof(local->component.msg), "%s%d:%05.2f - %s",
7575
dsda_TextColor(dsda_tc_exhud_event_split),

‎prboom2/src/dsda/hud_components/fps.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ static void dsda_UpdateComponentText(char* str, size_t max_size) {
3232
str,
3333
max_size,
3434
"%s%4d",
35-
dsda_render_stats_fps < 35 ? dsda_TextColor(dsda_tc_exhud_fps_bad) :
36-
dsda_TextColor(dsda_tc_exhud_fps_fine),
35+
dsda_render_stats_fps < TICRATE ? dsda_TextColor(dsda_tc_exhud_fps_bad) :
36+
dsda_TextColor(dsda_tc_exhud_fps_fine),
3737
dsda_render_stats_fps
3838
);
3939
}

‎prboom2/src/dsda/hud_components/level_splits.c‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -56,14 +56,14 @@ static void dsda_UpdateIntermissionTime(dsda_split_t* split) {
5656
snprintf(
5757
delta, sizeof(delta),
5858
" (%s%d:%05.2f)",
59-
sign, diff / 35 / 60, (float)(diff % (60 * 35)) / 35
59+
sign, diff / TICRATE / 60, (float)(diff % (60 * TICRATE)) / TICRATE
6060
);
6161
}
6262
else {
6363
snprintf(
6464
delta, sizeof(delta),
6565
" (%s%04.2f)",
66-
sign, (float)(diff % (60 * 35)) / 35
66+
sign, (float)(diff % (60 * TICRATE)) / TICRATE
6767
);
6868
}
6969
}
@@ -72,8 +72,8 @@ static void dsda_UpdateIntermissionTime(dsda_split_t* split) {
7272
local->time_component.msg,
7373
sizeof(local->time_component.msg),
7474
"%s%d:%05.2f",
75-
color, leveltime / 35 / 60,
76-
(float)(leveltime % (60 * 35)) / 35
75+
color, leveltime / TICRATE / 60,
76+
(float)(leveltime % (60 * TICRATE)) / TICRATE
7777
);
7878

7979
strcat(local->time_component.msg, delta);
@@ -92,7 +92,7 @@ static void dsda_UpdateIntermissionTotal(dsda_split_t* split) {
9292
const char* sign;
9393
int diff;
9494

95-
diff = dsda_SplitComparisonDelta(&split->totalleveltimes) / 35;
95+
diff = dsda_SplitComparisonDelta(&split->totalleveltimes) / TICRATE;
9696
sign = diff >= 0 ? "+" : "-";
9797
color = diff >= 0 ? dsda_TextColor(dsda_tc_inter_split_normal) :
9898
dsda_TextColor(dsda_tc_inter_split_good);
@@ -118,8 +118,8 @@ static void dsda_UpdateIntermissionTotal(dsda_split_t* split) {
118118
local->total_component.msg,
119119
sizeof(local->total_component.msg),
120120
"%s%d:%02d",
121-
color, totalleveltimes / 35 / 60,
122-
(totalleveltimes / 35) % 60
121+
color, totalleveltimes / TICRATE / 60,
122+
(totalleveltimes / TICRATE) % 60
123123
);
124124

125125
strcat(local->total_component.msg, delta);

‎prboom2/src/dsda/hud_components/map_time.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ static void dsda_UpdateComponentText(char* str, size_t max_size) {
3535
totalleveltimes + leveltime;
3636
level_time = leveltime;
3737

38-
total_time /= 35;
39-
level_time /= 35;
38+
total_time /= TICRATE;
39+
level_time /= TICRATE;
4040

4141
length = snprintf(
4242
str,

‎prboom2/src/dsda/hud_components/render_stats.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ static void dsda_UpdateCurrentComponentText(char* str, size_t max_size) {
3535
str, max_size,
3636
"%sFPS %s%4d %sSEGS %s%4d %sPLANES %s%4d %sSPRITES %s%4d",
3737
dsda_TextColor(dsda_tc_exhud_render_label),
38-
dsda_render_stats_fps < 35 ? dsda_TextColor(dsda_tc_exhud_render_bad) :
39-
dsda_TextColor(dsda_tc_exhud_render_good),
38+
dsda_render_stats_fps < TICRATE ? dsda_TextColor(dsda_tc_exhud_render_bad) :
39+
dsda_TextColor(dsda_tc_exhud_render_good),
4040
dsda_render_stats_fps,
4141
dsda_TextColor(dsda_tc_exhud_render_label),
4242
dsda_render_stats.drawsegs > 256 ? dsda_TextColor(dsda_tc_exhud_render_bad) :

‎prboom2/src/dsda/key_frame.c‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -296,7 +296,7 @@ void dsda_RestoreKeyFrame(dsda_key_frame_t* key_frame, dboolean skip_wipe) {
296296

297297
dsda_RestoreCommandHistory();
298298

299-
restore_key_frame_index = (totalleveltimes + leveltime) / (35 * autoKeyFrameInterval());
299+
restore_key_frame_index = (totalleveltimes + leveltime) / (TICRATE * autoKeyFrameInterval());
300300

301301
G_AfterLoad();
302302

@@ -384,7 +384,7 @@ void dsda_UpdateAutoKeyFrames(void) {
384384
) return;
385385

386386
current_time = totalleveltimes + leveltime;
387-
interval_tics = 35 * autoKeyFrameInterval();
387+
interval_tics = TICRATE * autoKeyFrameInterval();
388388

389389
// Automatically save a key frame each interval
390390
if (current_time % interval_tics == 0) {

0 commit comments

Comments
 (0)