Merge branch 'master' of github.com:ddnet/ddnet

This commit is contained in:
def 2016-05-07 16:12:41 +02:00
commit e0ee7a2bb9

View file

@ -70,11 +70,11 @@ void CCollision::Init(class CLayers *pLayers)
}
if(m_pLayers->TuneLayer())
{
{
unsigned int Size = m_pLayers->Map()->GetUncompressedDataSize(m_pLayers->TuneLayer()->m_Tune);
if (Size >= m_Width*m_Height*sizeof(CTuneTile))
m_pTune = static_cast<CTuneTile *>(m_pLayers->Map()->GetData(m_pLayers->TuneLayer()->m_Tune));
}
}
if(m_pLayers->FrontLayer())
{