mirror
/
OpenTTD
mirror of https://github.com/OpenTTD/OpenTTD
1
0
Fork 0
Code Issues

Fix #8232: 'Huge screenshot' warning being shown incorrectly

pull/8246/head
Abdurrahmaan Iqbal 2020-06-23 15:20:02 +01:00 committed by Charles Pigott
parent 3c8d0aa354
commit 8a655c7fb6
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/screenshot.cpp
View File

@ -854,11 +854,16 @@ void MakeScreenshotWithConfirm(ScreenshotType t)
{ {
ViewPort vp; ViewPort vp;
SetupScreenshotViewport(t, &vp); SetupScreenshotViewport(t, &vp);
if ((uint64)vp.width * (uint64)vp.height > 8192 * 8192) {
bool heightmap_or_minimap = t == SC_HEIGHTMAP || t == SC_MINIMAP;
uint64_t width = (heightmap_or_minimap ? MapSizeX() : vp.width);
uint64_t height = (heightmap_or_minimap ? MapSizeY() : vp.height);
if (width * height > 8192 * 8192) {
/* Ask for confirmation */ /* Ask for confirmation */
_confirmed_screenshot_type = t; _confirmed_screenshot_type = t;
SetDParam(0, vp.width); SetDParam(0, width);
SetDParam(1, vp.height); SetDParam(1, height);
ShowQuery(STR_WARNING_SCREENSHOT_SIZE_CAPTION, STR_WARNING_SCREENSHOT_SIZE_MESSAGE, nullptr, ScreenshotConfirmationCallback); ShowQuery(STR_WARNING_SCREENSHOT_SIZE_CAPTION, STR_WARNING_SCREENSHOT_SIZE_MESSAGE, nullptr, ScreenshotConfirmationCallback);
} else { } else {
/* Less than 64M pixels, just do it */ /* Less than 64M pixels, just do it */