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

Don't draw invalid tiles

Browse source
This commit is contained in:
Jupeyy 2017-10-24 20:41:11 +02:00
parent 442a1767d4
commit 3c8f937b79
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -580,7 +580,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(!IsValidSwitchTile(Index)) Index = 0; if(!IsValidSwitchTile(Index)) Index = 0;
if(CurOverlay == 0) else if(CurOverlay == 0)
{ {
Flags = ((CSwitchTile*)pTiles)[y*pTMap->m_Width+x].m_Flags; Flags = ((CSwitchTile*)pTiles)[y*pTMap->m_Width+x].m_Flags;
if(Index == TILE_SWITCHTIMEDOPEN) Index = 8; if(Index == TILE_SWITCHTIMEDOPEN) Index = 8;
@ -591,9 +591,9 @@ void CMapLayers::OnMapLoad()
if(IsTeleLayer) if(IsTeleLayer)
{ {
Index = ((CTeleTile*)pTiles)[y*pTMap->m_Width+x].m_Type; Index = ((CTeleTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
if(!IsValidTeleTile(Index)) Index = 0;
Flags = 0; Flags = 0;
if(CurOverlay == 1) if(!IsValidTeleTile(Index)) Index = 0;
else if(CurOverlay == 1)
{ {
if(Index != TILE_TELECHECKIN && Index != TILE_TELECHECKINEVIL) if(Index != TILE_TELECHECKIN && Index != TILE_TELECHECKINEVIL)
Index = ((CTeleTile*)pTiles)[y*pTMap->m_Width+x].m_Number; Index = ((CTeleTile*)pTiles)[y*pTMap->m_Width+x].m_Number;
@ -603,10 +603,10 @@ void CMapLayers::OnMapLoad()
if(IsSpeedupLayer) if(IsSpeedupLayer)
{ {
Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Type; Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Type;
if(!IsValidSpeedupTile(Index) || ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force == 0) Index = 0;
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(CurOverlay == 1) Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_Force; if(!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;
else if(CurOverlay == 2) Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_MaxSpeed; else if(CurOverlay == 2) Index = ((CSpeedupTile*)pTiles)[y*pTMap->m_Width+x].m_MaxSpeed;
} }
if(IsTuneLayer) if(IsTuneLayer)