mirrors/0ad
1
0
Fork 2
mirror of https://gitea.wildfiregames.com/0ad/0ad.git synced 2026-09-21 20:06:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Removes assertion from MinimapTexture on entities overflow.

Browse Source 
Differential Revision: https://code.wildfiregames.com/D4977
This was SVN commit r27601.
This commit is contained in:
vladislavbelov
2023-04-11 09:50:35 +00:00
parent ef71533d70
commit c138527abc
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
source/graphics/MiniMapTexture.cpp
+6 -2
View File
@@ -30,6 +30,7 @@
#include "graphics/TerritoryTexture.h"
#include "graphics/TextureManager.h"
#include "lib/bits.h"
#include "lib/code_generation.h"
#include "lib/hash.h"
#include "lib/timer.h"
#include "maths/MathUtil.h"
@@ -676,7 +677,7 @@ void CMiniMapTexture::UpdateAndUploadEntities(
v.b = 255;
pingingVertices.push_back(v);
}
else
else if (m_EntitiesDrawn < MAX_ENTITIES_DRAWN)
{
AddEntity(v, attrColor, attrPos, entityRadius, m_UseInstancing);
++m_EntitiesDrawn;
@@ -767,9 +768,12 @@ void CMiniMapTexture::UpdateAndUploadEntities(
{
AddEntity(vertex, attrColor, attrPos, entityRadius, m_UseInstancing);
++m_EntitiesDrawn;
if (m_EntitiesDrawn == MAX_ENTITIES_DRAWN)
break;
}
ENSURE(m_EntitiesDrawn < MAX_ENTITIES_DRAWN);
if (m_EntitiesDrawn == MAX_ENTITIES_DRAWN)
ONCE(LOGERROR("Too many entities, some of them will be hidden on the minimap."));
if (!m_UseInstancing)
{