From a49c004278b0e300521e9cedf44a46ac843a958b Mon Sep 17 00:00:00 2001 From: "madmaxoft@gmail.com" Date: Sat, 13 Apr 2013 21:02:10 +0000 Subject: Rewritten entities so that they are owned by individual chunks and ticked within their chunk's Tick() git-svn-id: http://mc-server.googlecode.com/svn/trunk@1385 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/Pickup.cpp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'source/Pickup.cpp') diff --git a/source/Pickup.cpp b/source/Pickup.cpp index 16e68b3ee..7cee53cb7 100644 --- a/source/Pickup.cpp +++ b/source/Pickup.cpp @@ -59,9 +59,9 @@ void cPickup::SpawnOn(cClientHandle & a_Client) -void cPickup::Tick(float a_Dt, MTRand & a_TickRandom) +void cPickup::Tick(float a_Dt, cChunk & a_Chunk) { - super::Tick(a_Dt, a_TickRandom); + super::Tick(a_Dt, a_Chunk); m_Timer += a_Dt; a_Dt = a_Dt / 1000.f; @@ -88,7 +88,6 @@ void cPickup::Tick(float a_Dt, MTRand & a_TickRandom) if (!m_bReplicated || m_bDirtyPosition) { - MoveToCorrectChunk(); m_bReplicated = true; m_bDirtyPosition = false; GetWorld()->BroadcastTeleportEntity(*this); @@ -99,8 +98,10 @@ void cPickup::Tick(float a_Dt, MTRand & a_TickRandom) -void cPickup::HandlePhysics(float a_Dt) +void cPickup::HandlePhysics(float a_Dt, cChunk & a_Chunk) { + // TODO: Rewrite this function to use a_Chunk instead of m_World + m_ResultingSpeed.Set(0.f, 0.f, 0.f); cWorld * World = GetWorld(); -- cgit v1.2.3