From 6882db1da2c368c72730f997601b362d361a72dc Mon Sep 17 00:00:00 2001
From: Learath <learath2@gmail.com>
Date: Wed, 31 Jul 2019 15:20:17 +0300
Subject: [PATCH] Introduce flag to render all entities

---
 datasrc/network.py                       |  2 +-
 src/game/client/components/maplayers.cpp | 12 ++++++------
 src/game/client/gameclient.cpp           |  2 ++
 src/game/client/gameclient.h             |  1 +
 4 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/datasrc/network.py b/datasrc/network.py
index 9b0e32340..9c4039648 100644
--- a/datasrc/network.py
+++ b/datasrc/network.py
@@ -17,7 +17,7 @@ GameInfoFlags = [
 	"BUG_DDRACE_INPUT", "BUG_FNG_LASER_RANGE", "BUG_VANILLA_BOUNCE",
 	"PREDICT_FNG", "PREDICT_DDRACE", "PREDICT_DDRACE_TILES", "PREDICT_VANILLA",
 	"ENTITIES_DDNET", "ENTITIES_DDRACE", "ENTITIES_RACE", "ENTITIES_FNG",
-	"ENTITIES_VANILLA",
+	"ENTITIES_VANILLA", "ENTITIES_UNUSED",
 ]
 
 Emoticons = ["OOP", "EXCLAMATION", "HEARTS", "DROP", "DOTDOT", "MUSIC", "SORRY", "GHOST", "SUSHI", "SPLATTEE", "DEVILTEE", "ZOMG", "ZZZ", "WTF", "EYES", "QUESTION"]
diff --git a/src/game/client/components/maplayers.cpp b/src/game/client/components/maplayers.cpp
index b5fe8f77e..2a895860d 100644
--- a/src/game/client/components/maplayers.cpp
+++ b/src/game/client/components/maplayers.cpp
@@ -620,21 +620,21 @@ void CMapLayers::OnMapLoad()
 									{
 										Index = ((CTile*)pTiles)[y*pTMap->m_Width+x].m_Index;
 										Flags = ((CTile*)pTiles)[y*pTMap->m_Width+x].m_Flags;
-										if(GameClient()->m_GameInfo.m_EntitiesDDNet && !IsValidGameTile(Index))
+										if(!GameClient()->m_GameInfo.m_EntitiesUnused && !IsValidGameTile(Index))
 											Index = 0;
 									}
 									if(IsFrontLayer)
 									{
 										Index = ((CTile*)pTiles)[y*pTMap->m_Width+x].m_Index;
 										Flags = ((CTile*)pTiles)[y*pTMap->m_Width+x].m_Flags;
-										if(GameClient()->m_GameInfo.m_EntitiesDDNet && !IsValidFrontTile(Index))
+										if(!GameClient()->m_GameInfo.m_EntitiesUnused && !IsValidFrontTile(Index))
 											Index = 0;
 									}
 									if(IsSwitchLayer)
 									{
 										Flags = 0;
 										Index = ((CSwitchTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
-										if(GameClient()->m_GameInfo.m_EntitiesDDNet && !IsValidSwitchTile(Index))
+										if(!GameClient()->m_GameInfo.m_EntitiesUnused && !IsValidSwitchTile(Index))
 											Index = 0;
 										else if(CurOverlay == 0)
 										{
@@ -650,7 +650,7 @@ void CMapLayers::OnMapLoad()
 									{
 										Index = ((CTeleTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
 										Flags = 0;
-										if(GameClient()->m_GameInfo.m_EntitiesDDNet && !IsValidTeleTile(Index))
+										if(!GameClient()->m_GameInfo.m_EntitiesUnused && !IsValidTeleTile(Index))
 											Index = 0;
 										else if(CurOverlay == 1)
 										{
@@ -664,7 +664,7 @@ void CMapLayers::OnMapLoad()
 										Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
 										Flags = 0;
 										AngleRotate = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width + x].m_Angle;
-										if(GameClient()->m_GameInfo.m_EntitiesDDNet && (!IsValidSpeedupTile(Index) || ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force == 0))
+										if(!GameClient()->m_GameInfo.m_EntitiesUnused && (!IsValidSpeedupTile(Index) || ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force == 0))
 											Index = 0;
 										else if(CurOverlay == 1)
 											Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force;
@@ -674,7 +674,7 @@ void CMapLayers::OnMapLoad()
 									if(IsTuneLayer)
 									{
 										Index = ((CTuneTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
-										if(GameClient()->m_GameInfo.m_EntitiesDDNet && !IsValidTuneTile(Index))
+										if(!GameClient()->m_GameInfo.m_EntitiesUnused && !IsValidTuneTile(Index))
 											Index = 0;
 										Flags = 0;
 									}
diff --git a/src/game/client/gameclient.cpp b/src/game/client/gameclient.cpp
index d2828ee09..168d5d5b6 100644
--- a/src/game/client/gameclient.cpp
+++ b/src/game/client/gameclient.cpp
@@ -1025,6 +1025,7 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
 	Info.m_EntitiesRace = Race;
 	Info.m_EntitiesFNG = FNG;
 	Info.m_EntitiesVanilla = Vanilla;
+	Info.m_EntitiesUnused = !DDNet;
 	Info.m_Race = Race;
 
 	if(Version >= 0)
@@ -1056,6 +1057,7 @@ static CGameInfo GetGameInfo(const CNetObj_GameInfoEx *pInfoEx, int InfoExSize,
 	}
 	if(Version >= 3)
 	{
+		Info.m_EntitiesUnused = Flags&GAMEINFOFLAG_ENTITIES_UNUSED;
 		Info.m_Race = Flags&GAMEINFOFLAG_RACE;
 	}
 	return Info;
diff --git a/src/game/client/gameclient.h b/src/game/client/gameclient.h
index 2d157bcd6..ee9b22637 100644
--- a/src/game/client/gameclient.h
+++ b/src/game/client/gameclient.h
@@ -88,6 +88,7 @@ public:
 	bool m_EntitiesFNG;
 	bool m_EntitiesVanilla;
 
+	bool m_EntitiesUnused;
 	bool m_Race;
 };