edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-19 22:48:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify handling of entities paths, remove unnecessary variables

Browse source
This commit is contained in:
Robert Müller 2024-03-16 17:52:54 +01:00
parent c97c3ac7b1
commit 29d924e061
1 changed files with 16 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
src/game/client/components/mapimages.cpp
View file

@ -187,43 +187,30 @@ IGraphics::CTextureHandle CMapImages::GetEntities(EMapImageEntityLayerType Entit
{ {
m_aEntitiesIsLoaded[(EntitiesModType * 2) + (int)EntitiesAreMasked] = true; m_aEntitiesIsLoaded[(EntitiesModType * 2) + (int)EntitiesAreMasked] = true;
char aPath[64];
str_format(aPath, sizeof(aPath), "%s/%s.png", m_aEntitiesPath, gs_apModEntitiesNames[EntitiesModType]);
int TextureLoadFlag = 0; int TextureLoadFlag = 0;
if(Graphics()->HasTextureArraysSupport()) if(Graphics()->HasTextureArraysSupport())
TextureLoadFlag = (Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE) | IGraphics::TEXLOAD_NO_2D_TEXTURE; TextureLoadFlag = (Graphics()->Uses2DTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE) | IGraphics::TEXLOAD_NO_2D_TEXTURE;
CImageInfo ImgInfo; CImageInfo ImgInfo;
bool ImagePNGLoaded = false; char aPath[IO_MAX_PATH_LENGTH];
if(Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL)) str_format(aPath, sizeof(aPath), "%s/%s.png", m_aEntitiesPath, gs_apModEntitiesNames[EntitiesModType]);
ImagePNGLoaded = true; Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
else
{
bool TryDefault = true;
// try as single ddnet replacement // try as single ddnet replacement
if(EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET) if(ImgInfo.m_pData == nullptr && EntitiesModType == MAP_IMAGE_MOD_TYPE_DDNET)
{ {
str_format(aPath, sizeof(aPath), "%s.png", m_aEntitiesPath); str_format(aPath, sizeof(aPath), "%s.png", m_aEntitiesPath);
if(Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL)) Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
{
ImagePNGLoaded = true;
TryDefault = false;
}
} }
if(!ImagePNGLoaded && TryDefault)
{
// try default // try default
str_format(aPath, sizeof(aPath), "editor/entities_clear/%s.png", gs_apModEntitiesNames[EntitiesModType]); if(ImgInfo.m_pData == nullptr)
if(Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL))
{ {
ImagePNGLoaded = true; str_format(aPath, sizeof(aPath), "editor/entities_clear/%s.png", gs_apModEntitiesNames[EntitiesModType]);
} Graphics()->LoadPNG(&ImgInfo, aPath, IStorage::TYPE_ALL);
}
} }
if(ImagePNGLoaded && ImgInfo.m_Width > 0 && ImgInfo.m_Height > 0) if(ImgInfo.m_pData != nullptr)
{ {
const size_t PixelSize = ImgInfo.PixelSize(); const size_t PixelSize = ImgInfo.PixelSize();
const size_t BuildImageSize = (size_t)ImgInfo.m_Width * ImgInfo.m_Height * PixelSize; const size_t BuildImageSize = (size_t)ImgInfo.m_Width * ImgInfo.m_Height * PixelSize;