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

Merge pull request #7400 from Robyt3/Client-Map-Loading-Warning

Browse source 
Allow loading embedded images without valid image name, show warning popup when map image/sound cannot be loaded
This commit is contained in:
Dennis Felsing 2023-10-31 22:50:58 +00:00 committed by GitHub
parent 7000b97425 8482e9475c
commit 03400f6ff3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 32 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,5 +1,7 @@
/* (c) Magnus Auvinen. See licence.txt in the root of the distribution for more information. */
/* If you are missing that file, acquire a complete release at teeworlds.com. */
#include "mapimages.h"
#include <base/log.h>
#include <engine/graphics.h>
@ -10,9 +12,12 @@
#include <game/client/gameclient.h>
#include <game/generated/client_data.h>
#include <game/layers.h>
#include <game/localization.h>
#include <game/mapitems.h>
#include "mapimages.h"
#include <chrono>
using namespace std::chrono_literals;
const char *const gs_apModEntitiesNames[] = {
"ddnet",
@ -103,6 +108,7 @@ void CMapImages::OnMapLoadImpl(class CLayers *pLayers, IMap *pMap)
const int TextureLoadFlag = Graphics()->HasTextureArrays() ? IGraphics::TEXLOAD_TO_2D_ARRAY_TEXTURE : IGraphics::TEXLOAD_TO_3D_TEXTURE;
// load new textures
bool ShowWarning = false;
for(int i = 0; i < m_Count; i++)
{
const int LoadFlag = (((m_aTextureUsedByTileOrQuadLayerFlag[i] & 1) != 0) ? TextureLoadFlag : 0) | (((m_aTextureUsedByTileOrQuadLayerFlag[i] & 2) != 0) ? 0 : (Graphics()->IsTileBufferingEnabled() ? IGraphics::TEXLOAD_NO_2D_TEXTURE : 0));
@ -112,8 +118,13 @@ void CMapImages::OnMapLoadImpl(class CLayers *pLayers, IMap *pMap)
const char *pName = pMap->GetDataString(pImg->m_ImageName);
if(pName == nullptr || pName[0] == '\0')
{
log_error("mapimages", "Failed to load map image %d: failed to load name.", i);
continue;
if(pImg->m_External)
{
log_error("mapimages", "Failed to load map image %d: failed to load name.", i);
ShowWarning = true;
continue;
}
pName = "(error)";
}
if(pImg->m_External)
@ -131,6 +142,11 @@ void CMapImages::OnMapLoadImpl(class CLayers *pLayers, IMap *pMap)
pMap->UnloadData(pImg->m_ImageData);
}
pMap->UnloadData(pImg->m_ImageName);
ShowWarning = ShowWarning || m_aTextures[i].Id() == Graphics()->InvalidTexture().Id();
}
if(ShowWarning)
{
m_pClient->m_Menus.PopupWarning(Localize("Warning"), Localize("Some map images could not be loaded. Check the local console for details."), Localize("Ok"), 10s);
}
}

14
src/game/client/components/mapsounds.cpp
View file

@ -1,3 +1,5 @@
#include "mapsounds.h"
#include <base/log.h>
#include <engine/demo.h>
@ -7,9 +9,12 @@
#include <game/client/components/sounds.h>
#include <game/client/gameclient.h>
#include <game/layers.h>
#include <game/localization.h>
#include <game/mapitems.h>
#include "mapsounds.h"
#include <chrono>
using namespace std::chrono_literals;
CMapSounds::CMapSounds()
{
@ -29,6 +34,7 @@ void CMapSounds::OnMapLoad()
m_Count = clamp<int>(m_Count, 0, MAX_MAPSOUNDS);
// load new samples
bool ShowWarning = false;
for(int i = 0; i < m_Count; i++)
{
CMapItemSound *pSound = (CMapItemSound *)pMap->GetItem(Start + i);
@ -38,6 +44,7 @@ void CMapSounds::OnMapLoad()
if(pName == nullptr || pName[0] == '\0')
{
log_error("mapsounds", "Failed to load map sound %d: failed to load name.", i);
ShowWarning = true;
continue;
}
@ -52,6 +59,11 @@ void CMapSounds::OnMapLoad()
m_aSounds[i] = Sound()->LoadOpusFromMem(pData, pSound->m_SoundDataSize);
pMap->UnloadData(pSound->m_SoundData);
}
ShowWarning = ShowWarning || m_aSounds[i] == -1;
}
if(ShowWarning)
{
m_pClient->m_Menus.PopupWarning(Localize("Warning"), Localize("Some map sounds could not be loaded. Check the local console for details."), Localize("Ok"), 10s);
}
// enqueue sound sources