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

Correctly embed replacing images

Browse source
This commit is contained in:
12pm 2019-07-17 03:00:09 +02:00
parent c2e318985c
commit 5f7a09dfe3
1 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/game/editor/editor.cpp
View file

@ -3481,7 +3481,6 @@ void CEditor::ReplaceImage(const char *pFileName, int StorageType, void *pUser)
return; return;
CEditorImage *pImg = pEditor->m_Map.m_lImages[pEditor->m_SelectedImage]; CEditorImage *pImg = pEditor->m_Map.m_lImages[pEditor->m_SelectedImage];
int External = pImg->m_External;
pEditor->Graphics()->UnloadTexture(pImg->m_TexID); pEditor->Graphics()->UnloadTexture(pImg->m_TexID);
if(pImg->m_pData) if(pImg->m_pData)
{ {
@ -3489,8 +3488,8 @@ void CEditor::ReplaceImage(const char *pFileName, int StorageType, void *pUser)
pImg->m_pData = 0; pImg->m_pData = 0;
} }
*pImg = ImgInfo; *pImg = ImgInfo;
pImg->m_External = External;
IStorage::StripPathAndExtension(pFileName, pImg->m_aName, sizeof(pImg->m_aName)); IStorage::StripPathAndExtension(pFileName, pImg->m_aName, sizeof(pImg->m_aName));
pImg->m_External = IsVanillaImage(pImg->m_aName);
pImg->m_AutoMapper.Load(pImg->m_aName); pImg->m_AutoMapper.Load(pImg->m_aName);
pImg->m_TexID = pEditor->Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, CImageInfo::FORMAT_AUTO, 0); pImg->m_TexID = pEditor->Graphics()->LoadTextureRaw(ImgInfo.m_Width, ImgInfo.m_Height, ImgInfo.m_Format, ImgInfo.m_pData, CImageInfo::FORMAT_AUTO, 0);
ImgInfo.m_pData = 0; ImgInfo.m_pData = 0;