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

Fix unmasked entities

Browse source
This commit is contained in:
fokkonaut 2019-08-06 23:43:11 +02:00
parent b0f1164485
commit fcc2e06352
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -634,7 +634,7 @@ void CMapLayers::OnMapLoad()
{ {
Flags = 0; Flags = 0;
Index = ((CSwitchTile*)pTiles)[y*pTMap->m_Width+x].m_Type; Index = ((CSwitchTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
if(!GameClient()->m_GameInfo.m_DontMaskEntities && !IsValidSwitchTile(Index)) if(!IsValidSwitchTile(Index))
Index = 0; Index = 0;
else if(CurOverlay == 0) else if(CurOverlay == 0)
{ {
@ -650,7 +650,7 @@ void CMapLayers::OnMapLoad()
{ {
Index = ((CTeleTile*)pTiles)[y*pTMap->m_Width+x].m_Type; Index = ((CTeleTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
Flags = 0; Flags = 0;
if(!GameClient()->m_GameInfo.m_DontMaskEntities && !IsValidTeleTile(Index)) if(!IsValidTeleTile(Index))
Index = 0; Index = 0;
else if(CurOverlay == 1) else if(CurOverlay == 1)
{ {
@ -664,7 +664,7 @@ void CMapLayers::OnMapLoad()
Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Type; Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
Flags = 0; Flags = 0;
AngleRotate = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width + x].m_Angle; AngleRotate = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width + x].m_Angle;
if(!GameClient()->m_GameInfo.m_DontMaskEntities && (!IsValidSpeedupTile(Index) || ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force == 0)) if(!IsValidSpeedupTile(Index) || ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force == 0)
Index = 0; Index = 0;
else if(CurOverlay == 1) else if(CurOverlay == 1)
Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force; Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force;
@ -674,7 +674,7 @@ void CMapLayers::OnMapLoad()
if(IsTuneLayer) if(IsTuneLayer)
{ {
Index = ((CTuneTile*)pTiles)[y*pTMap->m_Width+x].m_Type; Index = ((CTuneTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
if(!GameClient()->m_GameInfo.m_DontMaskEntities && !IsValidTuneTile(Index)) if(!IsValidTuneTile(Index))
Index = 0; Index = 0;
Flags = 0; Flags = 0;
} }