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

Jump to bottom

FIX issue-1566 - framerate stuck to 1 #1577

Merged
merged 2 commits into from Apr 16, 2023
Merged

FIX issue-1566 - framerate stuck to 1 #1577

merged 2 commits into from Apr 16, 2023

Conversation

Xellzul
Copy link
Contributor

@Xellzul Xellzul commented Apr 10, 2023

Fixes #1566
Issue was when vsync is set to number above 0, it is read as bool -> 1 and that is used as FPS limit

@Xellzul Xellzul force-pushed the fixframerate branch 2 times, most recently from 098135b to 2be43d6 Compare April 10, 2023 14:00
Flamefire
Flamefire requested changes Apr 10, 2023
View reviewed changes
Copy link
Member

@Flamefire Flamefire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! This was actually introduced by me with #1550

Hence the important part is the iniVideo->getIntValue("framerate"); change but I agree with the renaming. Just some smaller annotations.

libs/s25main/Settings.cpp Outdated Show resolved Hide resolved
libs/s25main/desktops/Desktop.cpp Outdated Show resolved Hide resolved
libs/s25main/desktops/dskOptions.cpp Outdated Show resolved Hide resolved
@Flamefire Flamefire mentioned this pull request Apr 10, 2023
Closed
Flamefire
Flamefire requested changes Apr 10, 2023
View reviewed changes
libs/s25main/Settings.cpp Outdated Show resolved Hide resolved
@Xellzul @Flamefire
Update libs/s25main/Settings.cpp
92ee6a7 
Co-authored-by: Alexander Grund <Flamefire@users.noreply.github.com>
Flamefire
Flamefire approved these changes Apr 10, 2023
View reviewed changes
Copy link
Member

@Flamefire Flamefire left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks!

@Flamefire Flamefire requested a review from Flow86 April 11, 2023 06:01
@Flow86 Flow86 disabled auto-merge April 16, 2023 04:51
@Flow86 Flow86 merged commit dd481ba into Return-To-The-Roots:master Apr 16, 2023
12 of 14 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Flamefire Flamefire Flamefire approved these changes

@Flow86 Flow86 Awaiting requested review from Flow86

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

vsync = 1 causes 1 FPS
3 participants
@Xellzul @Flamefire @Flow86