Assume 10 second countdown.

quakeworldnu · Jun 18, 2024 · d6cb26d · d6cb26d
1 parent 7dc49f3
commit d6cb26d
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 12 deletions.
diff --git a/src/pages/games/fte/fteController.ts b/src/pages/games/fte/fteController.ts
@@ -27,7 +27,8 @@ export class FteController {
   // @ts-ignore
   private _module: FteModule;
   private _volume = 0.0;
-  private _demoDuration = 0.0;
+  private _countdownDuration = 10.0;
+  private _demoDuration = 610.0;
   private _lastVolume = 0.0;
   private _maxVolume = 0.2;
   private _lastDemoSpeed = 100;
@@ -46,7 +47,7 @@ export class FteController {
     if (FteController._instance === null) {
       const fte = new FteController(module);
       fte.mute();
-      fte.setDemoDuration(demoDuration || 600);
+      fte.setDemoDuration(demoDuration || 610);
       FteController._instance = fte;
     }
 
@@ -106,16 +107,16 @@ export class FteController {
     this._demoDuration = value;
   }
 
-  getMatchStartTime(): number {
-    return this._demoDuration % 60;
+  getCountdownDuration(): number {
+    return this._countdownDuration;
   }
 
   getMatchElapsedTime(): number {
-    return this.getDemoElapsedTime() - this.getMatchStartTime();
+    return this.getDemoElapsedTime() - this.getCountdownDuration();
   }
 
   getMatchDuration(): number {
-    return this.getDemoDuration() - this.getMatchStartTime();
+    return this.getDemoDuration() - this.getCountdownDuration();
   }
 
   getPlayers(): Player[] {

diff --git a/src/pages/games/player/clips/ClipControls.tsx b/src/pages/games/player/clips/ClipControls.tsx
@@ -84,8 +84,7 @@ const AdjustControls = () => {
     return null;
   }
 
-  const countdownLength = fte.getMatchStartTime();
-  const rangeInGameTime = range.map((v) => v - countdownLength);
+  const rangeInGameTime = range.map((v) => v - fte.getCountdownDuration());
 
   return (
     <div className="flex flex-wrap grow items-center md:justify-center space-x-1 gap-y-1">

diff --git a/src/pages/games/player/clips/ClipRange.tsx b/src/pages/games/player/clips/ClipRange.tsx
@@ -33,7 +33,7 @@ export const ClipRange = () => {
 
   const min = 0;
   const max = Math.ceil(fte?.getDemoDuration()) || 610;
-  const countdownLength = fte?.getMatchStartTime();
+  const countdownLength = fte?.getCountdownDuration();
 
   return (
     <Range

diff --git a/src/pages/games/player/controls/DebugFte.tsx b/src/pages/games/player/controls/DebugFte.tsx
@@ -12,7 +12,7 @@ export const DebugFte = () => {
   const demoProps = {
     getDemoTotalTime: fte.getDemoDuration(),
     getDemoElapsedTime: fte.getDemoElapsedTime(),
-    getDemoGameStartTime: fte.getMatchStartTime(),
+    getDemoGameStartTime: fte.getCountdownDuration(),
 
     getGameTotalTime: fte.getMatchDuration(),
     getGameElapsedTime: fte.getMatchElapsedTime(),

diff --git a/src/pages/games/player/controls/TimeSlider.tsx b/src/pages/games/player/controls/TimeSlider.tsx
@@ -16,8 +16,8 @@ export function TimeSlider() {
   const isHover = useHover(sliderWrapperRef);
   const [mouse, sliderRootRef] = useMouse<HTMLDivElement>();
 
-  const countdownLength = fte ? fte.getMatchStartTime() : 10;
-  const maxValue = fte ? fte.getDemoDuration() : 1200;
+  const countdownLength = fte ? fte.getCountdownDuration() : 10;
+  const maxValue = fte ? fte.getDemoDuration() : 1210;
 
   useEffect(() => {
     if (!isHover || !tooltipRef.current) {