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

Merge pull request #7826 from Robyt3/Collision-Warning-Cleanup

Browse source 
Remove unnecessary check for entities close to map border
This commit is contained in:
Dennis Felsing 2024-01-18 22:39:40 +00:00 committed by GitHub
parent 0bce368c77 6e4afd7c63
commit c4135f117b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 10 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

45
src/game/collision.cpp
View file

@ -1032,51 +1032,26 @@ int CCollision::GetFTile(int x, int y) const
int CCollision::Entity(int x, int y, int Layer) const
{
if(x < 0 || x >= m_Width || y < 0 || y >= m_Height)
{
const char *pName;
switch(Layer)
{
case LAYER_GAME:
pName = "Game";
break;
case LAYER_FRONT:
pName = "Front";
break;
case LAYER_SWITCH:
pName = "Switch";
break;
case LAYER_TELE:
pName = "Tele";
break;
case LAYER_SPEEDUP:
pName = "Speedup";
break;
case LAYER_TUNE:
pName = "Tune";
break;
default:
pName = "Unknown";
}
dbg_msg("collision", "Something is VERY wrong with the %s layer near (%d, %d). Please report this at https://github.com/ddnet/ddnet/issues, you will need to post the map as well and any steps that you think may have led to this.", pName, x, y);
return 0;
}
const int Index = y * m_Width + x;
switch(Layer)
{
case LAYER_GAME:
return m_pTiles[y * m_Width + x].m_Index - ENTITY_OFFSET;
return m_pTiles[Index].m_Index - ENTITY_OFFSET;
case LAYER_FRONT:
return m_pFront[y * m_Width + x].m_Index - ENTITY_OFFSET;
return m_pFront[Index].m_Index - ENTITY_OFFSET;
case LAYER_SWITCH:
return m_pSwitch[y * m_Width + x].m_Type - ENTITY_OFFSET;
return m_pSwitch[Index].m_Type - ENTITY_OFFSET;
case LAYER_TELE:
return m_pTele[y * m_Width + x].m_Type - ENTITY_OFFSET;
return m_pTele[Index].m_Type - ENTITY_OFFSET;
case LAYER_SPEEDUP:
return m_pSpeedup[y * m_Width + x].m_Type - ENTITY_OFFSET;
return m_pSpeedup[Index].m_Type - ENTITY_OFFSET;
case LAYER_TUNE:
return m_pTune[y * m_Width + x].m_Type - ENTITY_OFFSET;
return m_pTune[Index].m_Type - ENTITY_OFFSET;
default:
return 0;
break;
dbg_assert(false, "Layer invalid");
dbg_break();
}
}