games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

Removed some usages of std string as resource path

Browse Source
This commit is contained in:
Ivan Savenko
2023-09-04 13:39:42 +03:00
parent 8dfdfffd87
commit 0f88b8969b
11 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
client/renderSDL/SDLImage.cpp
View File

@@ -31,7 +31,7 @@ std::shared_ptr<IImage> IImage::createFromFile( const ImagePath & path )
std::shared_ptr<IImage> IImage::createFromFile( const ImagePath & path, EImageBlitMode mode )
{
return std::shared_ptr<IImage>(new SDLImage(path.getName(), mode));
return std::shared_ptr<IImage>(new SDLImage(path, mode));
}
std::shared_ptr<IImage> IImage::createFromSurface( SDL_Surface * source )
@@ -89,9 +89,7 @@ SDLImage::SDLImage(const JsonNode & conf, EImageBlitMode mode)
fullSize(0, 0),
originalPalette(nullptr)
{
std::string filename = conf["file"].String();
surf = BitmapHandler::loadBitmap(filename);
surf = BitmapHandler::loadBitmap(ImagePath::fromJson(conf["file"]));
if(surf == nullptr)
return;
@@ -118,7 +116,7 @@ SDLImage::SDLImage(const JsonNode & conf, EImageBlitMode mode)
}
}
SDLImage::SDLImage(std::string filename, EImageBlitMode mode)
SDLImage::SDLImage(const ImagePath & filename, EImageBlitMode mode)
: surf(nullptr),
margins(0, 0),
fullSize(0, 0),
@@ -128,7 +126,7 @@ SDLImage::SDLImage(std::string filename, EImageBlitMode mode)
if(surf == nullptr)
{
logGlobal->error("Error: failed to load image %s", filename);
logGlobal->error("Error: failed to load image %s", filename.getOriginalName());
return;
}
else