games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-07-05 00:49:09 +02:00
Code Issues Releases Activity

Fixes for multiple new issues from Sonar

Browse Source
This commit is contained in:
Ivan Savenko
2025-02-20 16:57:52 +00:00
parent 0548f325e4
commit 2362c6da21
50 changed files with 190 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/renderSDL/ScalableImage.cpp
View File

@ -411,9 +411,9 @@ void ScalableImageInstance::playerColored(const PlayerColor & player)
image->preparePlayerColoredImage(player);
}
void ScalableImageParameters::playerColored(PlayerColor player)
void ScalableImageParameters::playerColored(PlayerColor playerColor)
{
graphics->setPlayerPalette(palette, player);
graphics->setPlayerPalette(palette, playerColor);
}
void ScalableImageInstance::shiftPalette(uint32_t firstColorID, uint32_t colorsToMove, uint32_t distanceToMove)
@ -451,9 +451,9 @@ std::shared_ptr<const ISharedImage> ScalableImageShared::loadOrGenerateImage(EIm
loadingLocator.playerColored = color;
// best case - requested image is already available in filesystem
auto loadedImage = GH.renderHandler().loadScaledImage(loadingLocator);
if (loadedImage)
return loadedImage;
auto loadedFullMatchImage = GH.renderHandler().loadScaledImage(loadingLocator);
if (loadedFullMatchImage)
return loadedFullMatchImage;
// optional images for 1x resolution - only try load them, don't attempt to generate
bool optionalImage =