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.

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 options initialize after SDL initializes for tiles build #39007

Merged
merged 2 commits into from
Mar 25, 2020

Conversation

luluvia
Copy link
Contributor

@luluvia luluvia commented Mar 25, 2020

Summary

SUMMARY: None

Purpose of change

Allows users to change the selected display for multiple-display systems.
Fixes #38921

Describe the solution

For normal build, the options initialization and load calls proceed as before. For builds with tiles, move those calls to sdltiles.cpp and call them after SDL has been initialized. Place the font loader section after these calls. In main.cpp, move set_language() after the interface has been initialized.

Describe alternatives you've considered

N/A

Testing

For the tiles build, load Cataclysm, go to the Options menu, go to Graphics, and find the Display option. Use the left and right arrow keys on the keyboard to switch between displays. Select a different display, then save changes and close. Open Cataclysm again to find that the display has been changed successfully.

@ZhilkinSerg ZhilkinSerg added <Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` SDL: Tiles / Sound Tiles visual interface and sounds. labels Mar 25, 2020
@ZhilkinSerg ZhilkinSerg merged commit 6dc97db into CleverRaven:master Mar 25, 2020
@luluvia luluvia deleted the fix-monitor-selection branch March 25, 2020 17:54
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
<Bugfix> This is a fix for a bug (or closes open issue) [C++] Changes (can be) made in C++. Previously named `Code` SDL: Tiles / Sound Tiles visual interface and sounds.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Cannot switch display monitor / game cannot detect different monitors
2 participants