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

Show tune layers in entities again

Browse source
This commit is contained in:
def 2014-07-26 12:33:25 +02:00
parent b0594d5e5a
commit 5864a47c4b
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

BIN
data/editor/entities_clear.png
View file

Binary file not shown.
Side by side Swipe Overlay

Before

Width:  |  Height:  |  Size: 306 KiB

After

Width:  |  Height:  |  Size: 306 KiB

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

@ -168,7 +168,7 @@ void CMapLayers::OnRender()
bool IsSwitchLayer = false; bool IsSwitchLayer = false;
bool IsTeleLayer = false; bool IsTeleLayer = false;
bool IsSpeedupLayer = false; bool IsSpeedupLayer = false;
//bool IsTuneLayer = false; bool IsTuneLayer = false;
if(pLayer == (CMapItemLayer*)m_pLayers->GameLayer()) if(pLayer == (CMapItemLayer*)m_pLayers->GameLayer())
{ {
@ -188,10 +188,8 @@ void CMapLayers::OnRender()
if(pLayer == (CMapItemLayer*)m_pLayers->SpeedupLayer()) if(pLayer == (CMapItemLayer*)m_pLayers->SpeedupLayer())
IsSpeedupLayer = true; IsSpeedupLayer = true;
/*
if(pLayer == (CMapItemLayer*)m_pLayers->TuneLayer()) if(pLayer == (CMapItemLayer*)m_pLayers->TuneLayer())
IsTuneLayer = true; IsTuneLayer = true;
*/
// skip rendering if detail layers if not wanted // skip rendering if detail layers if not wanted
if(pLayer->m_Flags&LAYERFLAG_DETAIL && !g_Config.m_GfxHighDetail && !IsGameLayer) if(pLayer->m_Flags&LAYERFLAG_DETAIL && !g_Config.m_GfxHighDetail && !IsGameLayer)
@ -366,7 +364,6 @@ void CMapLayers::OnRender()
RenderTools()->RenderSpeedupOverlay(pSpeedupTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, g_Config.m_ClOverlayEntities/100.0f); RenderTools()->RenderSpeedupOverlay(pSpeedupTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, g_Config.m_ClOverlayEntities/100.0f);
} }
} }
/*
else if(g_Config.m_ClOverlayEntities && IsTuneLayer) else if(g_Config.m_ClOverlayEntities && IsTuneLayer)
{ {
CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer; CMapItemLayerTilemap *pTMap = (CMapItemLayerTilemap *)pLayer;
@ -384,10 +381,9 @@ void CMapLayers::OnRender()
RenderTools()->RenderTunemap(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND|LAYERRENDERFLAG_OPAQUE); RenderTools()->RenderTunemap(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND|LAYERRENDERFLAG_OPAQUE);
Graphics()->BlendNormal(); Graphics()->BlendNormal();
RenderTools()->RenderTunemap(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND|LAYERRENDERFLAG_TRANSPARENT); RenderTools()->RenderTunemap(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, Color, TILERENDERFLAG_EXTEND|LAYERRENDERFLAG_TRANSPARENT);
RenderTools()->RenderTuneOverlay(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, g_Config.m_ClOverlayEntities/100.0f); //RenderTools()->RenderTuneOverlay(pTuneTiles, pTMap->m_Width, pTMap->m_Height, 32.0f, g_Config.m_ClOverlayEntities/100.0f);
} }
} }
*/
} }
if(!g_Config.m_GfxNoclip) if(!g_Config.m_GfxNoclip)
Graphics()->ClipDisable(); Graphics()->ClipDisable();