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

check that index in within array bounds + only predict grenade projectiles (by nuborn)

Browse source
This commit is contained in:
def 2014-10-25 01:08:14 +02:00
parent 3d9b232157
commit 1523954333
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/game/client/gameclient.cpp
View file

@ -1222,14 +1222,17 @@ void CGameClient::OnPredict()
const void *pData = Client()->SnapGetItem(IClient::SNAP_CURRENT, Index, &Item);
if(Item.m_Type == NETOBJTYPE_PROJECTILE)
{
TempProjectiles[NumProjectiles].Init(this, &World, Collision(), (const CNetObj_Projectile *)pData);
if(((const CNetObj_Projectile*)pData)->m_Type == WEAPON_GRENADE)
{
TempProjectiles[NumProjectiles].Init(this, &World, Collision(), (const CNetObj_Projectile *)pData);
int Index = TempProjectiles[NumProjectiles].m_StartTick % 64;
if(m_aLocalProjectiles[Index].m_Active)
if(m_aLocalProjectiles[Index].m_StartTick == TempProjectiles[NumProjectiles].m_StartTick)
if(distance(m_aLocalProjectiles[Index].m_Pos, TempProjectiles[NumProjectiles].m_Pos) < 3)
TempProjectiles[NumProjectiles] = m_aLocalProjectiles[Index];
NumProjectiles++;
int Index = TempProjectiles[NumProjectiles].m_StartTick % 64;
if(m_aLocalProjectiles[Index].m_Active)
if(m_aLocalProjectiles[Index].m_StartTick == TempProjectiles[NumProjectiles].m_StartTick)
if(distance(m_aLocalProjectiles[Index].m_Pos, TempProjectiles[NumProjectiles].m_Pos) < 3)
TempProjectiles[NumProjectiles] = m_aLocalProjectiles[Index];
NumProjectiles++;
}
}
}
}
@ -1318,6 +1321,8 @@ void CGameClient::OnPredict()
{
case WEAPON_GRENADE:
{
if(NumProjectiles >= 64)
break;
TempProjectiles[NumProjectiles].Init(
this, &World, Collision(),
Direction, //StartDir