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

prediction/entity: Sync ID getter name with the server/entity

Browse source
This commit is contained in:
Alexander Akulich 2022-07-14 23:34:08 +03:00
parent 1f264a042d
commit 5169369809
2 changed files with 4 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/game/client/components/items.cpp
View file

@ -334,7 +334,7 @@ void CItems::OnRender()
continue; continue;
CProjectileData Data = pProj->GetData(); CProjectileData Data = pProj->GetData();
RenderProjectile(&Data, pProj->ID()); RenderProjectile(&Data, pProj->GetID());
} }
for(CEntity *pEnt = GameClient()->m_PredictedWorld.FindFirst(CGameWorld::ENTTYPE_LASER); pEnt; pEnt = pEnt->NextEntity()) for(CEntity *pEnt = GameClient()->m_PredictedWorld.FindFirst(CGameWorld::ENTTYPE_LASER); pEnt; pEnt = pEnt->NextEntity())
{ {
@ -352,7 +352,7 @@ void CItems::OnRender()
if(pPickup->InDDNetTile()) if(pPickup->InDDNetTile())
{ {
if(auto *pPrev = (CPickup *)GameClient()->m_PrevPredictedWorld.GetEntity(pPickup->ID(), CGameWorld::ENTTYPE_PICKUP)) if(auto *pPrev = (CPickup *)GameClient()->m_PrevPredictedWorld.GetEntity(pPickup->GetID(), CGameWorld::ENTTYPE_PICKUP))
{ {
CNetObj_Pickup Data, Prev; CNetObj_Pickup Data, Prev;
pPickup->FillInfo(&Data); pPickup->FillInfo(&Data);

3
src/game/client/prediction/entity.h
View file

@ -35,6 +35,8 @@ protected:
int m_ObjType; int m_ObjType;
public: public:
int GetID() const { return m_ID; }
CEntity(CGameWorld *pGameWorld, int Objtype, vec2 Pos = vec2(0, 0), int ProximityRadius = 0); CEntity(CGameWorld *pGameWorld, int Objtype, vec2 Pos = vec2(0, 0), int ProximityRadius = 0);
virtual ~CEntity(); virtual ~CEntity();
@ -64,7 +66,6 @@ public:
CEntity *m_pParent; CEntity *m_pParent;
CEntity *m_pChild; CEntity *m_pChild;
CEntity *NextEntity() { return m_pNextTypeEntity; } CEntity *NextEntity() { return m_pNextTypeEntity; }
int ID() { return m_ID; }
void Keep() void Keep()
{ {
m_SnapTicks = 0; m_SnapTicks = 0;