From 5b54e9c1ad10fa29c09b82a5bbc4187d639b6750 Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Thu, 29 Apr 2021 16:16:04 +0200 Subject: [PATCH] - removed the 26 factor from Duke's par times. What were they thinking? --- source/games/duke/src/gamedef.cpp | 8 ++++---- wadsrc/static/zscript/games/duke/ui/screens.zs | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/source/games/duke/src/gamedef.cpp b/source/games/duke/src/gamedef.cpp index 6eb5c81da..5720d3f82 100644 --- a/source/games/duke/src/gamedef.cpp +++ b/source/games/duke/src/gamedef.cpp @@ -1703,15 +1703,15 @@ int ConCompiler::parsecommand() while (*textptr == ' ' || *textptr == '\t') textptr++; map->parTime = - (((*(textptr + 0) - '0') * 10 + (*(textptr + 1) - '0')) * 26 * 60) + - (((*(textptr + 3) - '0') * 10 + (*(textptr + 4) - '0')) * 26); + (((*(textptr + 0) - '0') * 10 + (*(textptr + 1) - '0')) * 60) + + (((*(textptr + 3) - '0') * 10 + (*(textptr + 4) - '0'))); textptr += 5; while (*textptr == ' ' || *textptr == '\t') textptr++; map->designerTime = - (((*(textptr + 0) - '0') * 10 + (*(textptr + 1) - '0')) * 26 * 60) + - (((*(textptr + 3) - '0') * 10 + (*(textptr + 4) - '0')) * 26); + (((*(textptr + 0) - '0') * 10 + (*(textptr + 1) - '0')) * 60) + + (((*(textptr + 3) - '0') * 10 + (*(textptr + 4) - '0'))); map->levelNumber = levnum; map->cluster = j + 1; diff --git a/wadsrc/static/zscript/games/duke/ui/screens.zs b/wadsrc/static/zscript/games/duke/ui/screens.zs index d04bbb678..c4030a162 100644 --- a/wadsrc/static/zscript/games/duke/ui/screens.zs +++ b/wadsrc/static/zscript/games/duke/ui/screens.zs @@ -681,12 +681,12 @@ class DukeLevelSummaryScreen : SummaryScreenBase tempbuf = FormatTime(stats.time); Duke.GameText((320 >> 2) + 71, 59 + 9, tempbuf, 0); - tempbuf = FormatTime(level.parTime / 26); // Build weirdness again... + tempbuf = FormatTime(level.parTime); Duke.GameText((320 >> 2) + 71, 69 + 9, tempbuf, 0); if (!Raze.isNamWW2GI()) { - tempbuf = FormatTime(level.designerTime / 26); + tempbuf = FormatTime(level.designerTime); Duke.GameText((320 >> 2) + 71, 79 + 9, tempbuf, 0); } } @@ -911,10 +911,10 @@ class RRLevelSummaryScreen : SummaryScreenBase tempbuf = FormatTime(stats.time); Duke.BigText(191, 48, tempbuf, -1); - tempbuf = FormatTime(level.parTime / 26); + tempbuf = FormatTime(level.parTime); Duke.BigText(191, 64, tempbuf, -1); - tempbuf = FormatTime(level.designerTime / 26); + tempbuf = FormatTime(level.designerTime); Duke.BigText(191, 80, tempbuf, -1); } }