mirror of
https://github.com/vcmi/vcmi.git
synced 2026-06-19 22:57:37 +02:00
fix
This commit is contained in:
@@ -137,7 +137,7 @@ RenderHandler::AnimationLayoutMap & RenderHandler::getAnimationLayout(const Anim
|
|||||||
|
|
||||||
auto it = animationLayouts.find(actualPath);
|
auto it = animationLayouts.find(actualPath);
|
||||||
|
|
||||||
if (it != animationLayouts.end() && settings["video"]["useHdTextures"].Bool())
|
if (it != animationLayouts.end() && (settings["video"]["useHdTextures"].Bool() || scalingFactor == 1))
|
||||||
return it->second;
|
return it->second;
|
||||||
|
|
||||||
AnimationLayoutMap result;
|
AnimationLayoutMap result;
|
||||||
@@ -304,10 +304,10 @@ std::shared_ptr<SDLImageShared> RenderHandler::loadScaledImage(const ImageLocato
|
|||||||
auto imagePathSprites = ImagePath::builtin(imagePathString).addPrefix(scaledSpritesPath.at(locator.scalingFactor));
|
auto imagePathSprites = ImagePath::builtin(imagePathString).addPrefix(scaledSpritesPath.at(locator.scalingFactor));
|
||||||
auto imagePathData = ImagePath::builtin(imagePathString).addPrefix(scaledDataPath.at(locator.scalingFactor));
|
auto imagePathData = ImagePath::builtin(imagePathString).addPrefix(scaledDataPath.at(locator.scalingFactor));
|
||||||
|
|
||||||
if(CResourceHandler::get()->existsResource(imagePathSprites) && settings["video"]["useHdTextures"].Bool())
|
if(CResourceHandler::get()->existsResource(imagePathSprites) && (settings["video"]["useHdTextures"].Bool() || locator.scalingFactor == 1))
|
||||||
return std::make_shared<SDLImageShared>(imagePathSprites);
|
return std::make_shared<SDLImageShared>(imagePathSprites);
|
||||||
|
|
||||||
if(CResourceHandler::get()->existsResource(imagePathData) && settings["video"]["useHdTextures"].Bool())
|
if(CResourceHandler::get()->existsResource(imagePathData) && (settings["video"]["useHdTextures"].Bool() || locator.scalingFactor == 1))
|
||||||
return std::make_shared<SDLImageShared>(imagePathData);
|
return std::make_shared<SDLImageShared>(imagePathData);
|
||||||
|
|
||||||
if(CResourceHandler::get()->existsResource(imagePath))
|
if(CResourceHandler::get()->existsResource(imagePath))
|
||||||
|
|||||||
Reference in New Issue
Block a user