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

Entities: Get rid of direct m_ID access

Browse source
This commit is contained in:
Alexander Akulich 2021-01-09 23:40:17 +03:00
parent 035a50dd0b
commit b0db610a47
8 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/game/server/entities/door.cpp
View file

@ -66,7 +66,7 @@ void CDoor::Snap(int SnappingClient)
return; return;
CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem( CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(
NETOBJTYPE_LASER, m_ID, sizeof(CNetObj_Laser))); NETOBJTYPE_LASER, GetID(), sizeof(CNetObj_Laser)));
if(!pObj) if(!pObj)
return; return;

2
src/game/server/entities/dragger.cpp
View file

@ -225,7 +225,7 @@ void CDragger::Snap(int SnappingClient)
if(i == -1) if(i == -1)
{ {
obj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem( obj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(
NETOBJTYPE_LASER, m_ID, sizeof(CNetObj_Laser))); NETOBJTYPE_LASER, GetID(), sizeof(CNetObj_Laser)));
} }
else else
{ {

2
src/game/server/entities/gun.cpp
View file

@ -123,7 +123,7 @@ void CGun::Snap(int SnappingClient)
int Tick = (Server()->Tick() % Server()->TickSpeed()) % 11; int Tick = (Server()->Tick() % Server()->TickSpeed()) % 11;
if(Char && Char->IsAlive() && (m_Layer == LAYER_SWITCH && !GameServer()->Collision()->m_pSwitchers[m_Number].m_Status[Char->Team()]) && (!Tick)) if(Char && Char->IsAlive() && (m_Layer == LAYER_SWITCH && !GameServer()->Collision()->m_pSwitchers[m_Number].m_Status[Char->Team()]) && (!Tick))
return; return;
CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(NETOBJTYPE_LASER, m_ID, sizeof(CNetObj_Laser))); CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(NETOBJTYPE_LASER, GetID(), sizeof(CNetObj_Laser)));
if(!pObj) if(!pObj)
return; return;

2
src/game/server/entities/laser.cpp
View file

@ -275,7 +275,7 @@ void CLaser::Snap(int SnappingClient)
if(!CmaskIsSet(TeamMask, SnappingClient)) if(!CmaskIsSet(TeamMask, SnappingClient))
return; return;
CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(NETOBJTYPE_LASER, m_ID, sizeof(CNetObj_Laser))); CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(NETOBJTYPE_LASER, GetID(), sizeof(CNetObj_Laser)));
if(!pObj) if(!pObj)
return; return;

2
src/game/server/entities/light.cpp
View file

@ -115,7 +115,7 @@ void CLight::Snap(int SnappingClient)
return; return;
CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem( CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(
NETOBJTYPE_LASER, m_ID, sizeof(CNetObj_Laser))); NETOBJTYPE_LASER, GetID(), sizeof(CNetObj_Laser)));
if(!pObj) if(!pObj)
return; return;

2
src/game/server/entities/pickup.cpp
View file

@ -166,7 +166,7 @@ void CPickup::Snap(int SnappingClient)
return; return;
int Size = Server()->IsSixup(SnappingClient) ? 3 * 4 : sizeof(CNetObj_Pickup); int Size = Server()->IsSixup(SnappingClient) ? 3 * 4 : sizeof(CNetObj_Pickup);
CNetObj_Pickup *pP = static_cast<CNetObj_Pickup *>(Server()->SnapNewItem(NETOBJTYPE_PICKUP, m_ID, Size)); CNetObj_Pickup *pP = static_cast<CNetObj_Pickup *>(Server()->SnapNewItem(NETOBJTYPE_PICKUP, GetID(), Size));
if(!pP) if(!pP)
return; return;

2
src/game/server/entities/plasma.cpp
View file

@ -104,7 +104,7 @@ void CPlasma::Snap(int SnappingClient)
return; return;
CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem( CNetObj_Laser *pObj = static_cast<CNetObj_Laser *>(Server()->SnapNewItem(
NETOBJTYPE_LASER, m_ID, sizeof(CNetObj_Laser))); NETOBJTYPE_LASER, GetID(), sizeof(CNetObj_Laser)));
if(!pObj) if(!pObj)
return; return;

2
src/game/server/entities/projectile.cpp
View file

@ -319,7 +319,7 @@ void CProjectile::Snap(int SnappingClient)
if(m_Owner != -1 && !CmaskIsSet(TeamMask, SnappingClient)) if(m_Owner != -1 && !CmaskIsSet(TeamMask, SnappingClient))
return; return;
CNetObj_Projectile *pProj = static_cast<CNetObj_Projectile *>(Server()->SnapNewItem(NETOBJTYPE_PROJECTILE, m_ID, sizeof(CNetObj_Projectile))); CNetObj_Projectile *pProj = static_cast<CNetObj_Projectile *>(Server()->SnapNewItem(NETOBJTYPE_PROJECTILE, GetID(), sizeof(CNetObj_Projectile)));
if(pProj) if(pProj)
{ {
if(SnappingClient > -1 && GameServer()->m_apPlayers[SnappingClient] && GameServer()->m_apPlayers[SnappingClient]->GetClientVersion() >= VERSION_DDNET_ANTIPING_PROJECTILE) if(SnappingClient > -1 && GameServer()->m_apPlayers[SnappingClient] && GameServer()->m_apPlayers[SnappingClient]->GetClientVersion() >= VERSION_DDNET_ANTIPING_PROJECTILE)