Merge pull request #416 from avaraline/fix-FramesFromNow

make FramesFromNow() accept a float arg
avaraline · Jul 3, 2024 · 862a756 · 862a756
2 parents 402105d + 2b07dfc
commit 862a756
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/src/game/CAvaraGame.cpp b/src/game/CAvaraGame.cpp
@@ -1135,7 +1135,7 @@ void CAvaraGame::IncrementFrame(bool firstFrame) {
     isClassicFrame = (frameNumber % (CLASSICFRAMETIME / frameTime) == 0);
 }
 
-FrameNumber CAvaraGame::FramesFromNow(FrameNumber classicFrameCount) {
+FrameNumber CAvaraGame::FramesFromNow(double classicFrameCount) {
     return frameNumber + classicFrameCount / fpsScale;
 }
 

diff --git a/src/game/CAvaraGame.h b/src/game/CAvaraGame.h
@@ -269,7 +269,7 @@ class CAvaraGame {
     virtual FrameNumber NextFrameForPeriod(long period, long referenceFrame = 0);
     virtual void SetFrameTime(int32_t ft);
     virtual void IncrementFrame(bool firstFrame = false);
-    virtual FrameNumber FramesFromNow(FrameNumber classicFrames);
+    virtual FrameNumber FramesFromNow(double classicFrames);
     virtual void SetSpawnOrder(SpawnOrder order);
 
     void SetKeysFromStdin() { keysFromStdin = true; };