Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

make FramesFromNow() accept a float arg #416

Merged
merged 1 commit into from
Jul 3, 2024
Merged

make FramesFromNow() accept a float arg #416

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/game/CAvaraGame.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}

Expand Down
2 changes: 1 addition & 1 deletion src/game/CAvaraGame.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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; };
Expand Down
Loading