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 #1870

Browse source 
1870: Clarify what `ENTITIES_UNUSED` does by renaming it r=Learath2 a=heinrich5991



Co-authored-by: heinrich5991 <heinrich5991@gmail.com>
This commit is contained in:
bors[bot] 2019-07-31 20:57:55 +00:00
parent d2aaa61ab9 9627fd0841
commit 17fd8ae79a
4 changed files with 11 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
datasrc/network.py
View file

@ -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_UNUSED",
"ENTITIES_VANILLA", "DONT_MASK_ENTITIES",
]
ExPlayerFlags = ["AFK"]

12
src/game/client/components/maplayers.cpp
View file

@ -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_EntitiesUnused && !IsValidGameTile(Index))
if(!GameClient()->m_GameInfo.m_DontMaskEntities && !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_EntitiesUnused && !IsValidFrontTile(Index))
if(!GameClient()->m_GameInfo.m_DontMaskEntities && !IsValidFrontTile(Index))
Index = 0;
}
if(IsSwitchLayer)
{
Flags = 0;
Index = ((CSwitchTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
if(!GameClient()->m_GameInfo.m_EntitiesUnused && !IsValidSwitchTile(Index))
if(!GameClient()->m_GameInfo.m_DontMaskEntities && !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_EntitiesUnused && !IsValidTeleTile(Index))
if(!GameClient()->m_GameInfo.m_DontMaskEntities && !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_EntitiesUnused && (!IsValidSpeedupTile(Index) || ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force == 0))
if(!GameClient()->m_GameInfo.m_DontMaskEntities && (!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_EntitiesUnused && !IsValidTuneTile(Index))
if(!GameClient()->m_GameInfo.m_DontMaskEntities && !IsValidTuneTile(Index))
Index = 0;
Flags = 0;
}

4
src/game/client/gameclient.cpp
View file

@ -1025,8 +1025,8 @@ 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;
Info.m_DontMaskEntities = !DDNet;
if(Version >= 0)
{
@ -1057,8 +1057,8 @@ 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;
Info.m_DontMaskEntities = Flags&GAMEINFOFLAG_DONT_MASK_ENTITIES;
}
return Info;
}

3
src/game/client/gameclient.h
View file

@ -88,8 +88,9 @@ public:
bool m_EntitiesFNG;
bool m_EntitiesVanilla;
bool m_EntitiesUnused;
bool m_Race;
bool m_DontMaskEntities;
};
class CGameClient : public IGameClient