backup/planetblupi
1
0
Fork 0
mirror of https://github.com/blupi-games/planetblupi synced 2024-12-30 10:15:36 +01:00
Code Issues Projects Releases Activity

Merge branch 'master' of https://github.com/blupi-games/planetblupi

Browse Source
This commit is contained in:
Mathieu Schroeter 2018-08-03 12:13:29 +02:00
commit 078f66843e
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pixmap.cxx
View File

@ -256,7 +256,7 @@ CPixmap::ReloadTargetTextures ()
}
else if (!Cache (
tex.first, tex.second.file, tex.second.dimTotal,
tex.second.dimIcon))
tex.second.dimIcon, Mode::FIX, tex.second.wideName))
return false;
}
@ -296,6 +296,7 @@ CPixmap::Cache (size_t channel, Point totalDim)
m_SDLTextureInfo[channel].dimIcon = Point{0, 0};
m_SDLTextureInfo[channel].dimTotal = totalDim;
m_SDLTextureInfo[channel].file = "";
m_SDLTextureInfo[channel].wideName = "";
return true;
}
@ -354,6 +355,7 @@ CPixmap::Cache (
m_SDLTextureInfo[channel].dimIcon = iconDim;
m_SDLTextureInfo[channel].dimTotal = totalDim;
m_SDLTextureInfo[channel].file = pFilename;
m_SDLTextureInfo[channel].wideName = wideName;
SDL_SetRenderTarget (g_renderer, m_SDLTextureInfo[channel].texture);
@ -365,7 +367,7 @@ CPixmap::Cache (
{
if (!wideName.empty ())
{
std::string file = GetBaseDir () + wideName;
std::string file = GetBaseDir () + m_SDLTextureInfo[channel].wideName;
SDL_Surface * surface = IMG_Load (file.c_str ());
SDL_Texture * texture =
SDL_CreateTextureFromSurface (g_renderer, surface);

1
src/pixmap.h
View File

@ -34,6 +34,7 @@ struct TextureInfo {
SDL_Texture * texture;
bool target; // can be used as a render target
std::string file;
std::string wideName;
Point dimTotal;
Point dimIcon;