1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-08-10 22:31:40 +02:00

fix fallback scaling

This commit is contained in:
Laserlicht
2024-11-09 17:58:23 +01:00
parent 35e198078b
commit 3872a3ea89

View File

@@ -327,13 +327,13 @@ std::shared_ptr<ISharedImage> RenderHandler::scaleImage(const ImageLocator & loc
std::shared_ptr<IImage> RenderHandler::loadImage(const ImageLocator & locator, EImageBlitMode mode) std::shared_ptr<IImage> RenderHandler::loadImage(const ImageLocator & locator, EImageBlitMode mode)
{ {
ImageLocator loc = locator; ImageLocator loc = locator;
if(loc.defFile && loc.scalingFactor == 0 && loc.preScaledFactor == 1) if(loc.defFile && loc.scalingFactor == 0)
{ {
auto tmp = getScalePath(*loc.defFile); auto tmp = getScalePath(*loc.defFile);
loc.defFile = AnimationPath::builtin(tmp.first.getName()); loc.defFile = AnimationPath::builtin(tmp.first.getName());
loc.preScaledFactor = tmp.second; loc.preScaledFactor = tmp.second;
} }
if(loc.image && loc.scalingFactor == 0 && loc.preScaledFactor == 1) if(loc.image && loc.scalingFactor == 0)
{ {
auto tmp = getScalePath(*loc.image); auto tmp = getScalePath(*loc.image);
loc.image = ImagePath::builtin(tmp.first.getName()); loc.image = ImagePath::builtin(tmp.first.getName());