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

Fix rendertarget size being saved as screensize #13313

Merged
merged 2 commits into from
Mar 12, 2023
Merged

Fix rendertarget size being saved as screensize #13313

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f05515d
Fix rendertarget size being saved as screensize
Desour Mar 12, 2023
7c13d3d
use dimension2du
Desour Mar 12, 2023
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
13 changes: 7 additions & 6 deletions src/client/game.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1192,8 +1192,8 @@ void Game::run()
&& client->checkPrivilege("fast");
#endif

v2u32 previous_screen_size(g_settings->getU16("screen_w"),
g_settings->getU16("screen_h"));
core::dimension2du previous_screen_size(g_settings->getU16("screen_w"),
g_settings->getU16("screen_h"));

while (m_rendering_engine->run()
&& !(*kill || g_gamecallback->shutdown_requested
Expand All @@ -1217,16 +1217,17 @@ void Game::run()
}
}

const auto &current_screen_size = current_dynamic_info.render_target_size;
const core::dimension2du &current_screen_size =
RenderingEngine::get_video_driver()->getScreenSize();

// Verify if window size has changed and save it if it's the case
// Ensure evaluating settings->getBool after verifying screensize
// First condition is cheaper
if (previous_screen_size != current_screen_size &&
current_screen_size != irr::core::dimension2d<u32>(0,0) &&
current_screen_size != core::dimension2du(0, 0) &&
g_settings->getBool("autosave_screensize")) {
g_settings->setU16("screen_w", current_screen_size.X);
g_settings->setU16("screen_h", current_screen_size.Y);
g_settings->setU16("screen_w", current_screen_size.Width);
g_settings->setU16("screen_h", current_screen_size.Height);
previous_screen_size = current_screen_size;
}

Expand Down