diff options
| author | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-04-13 23:02:10 +0200 |
|---|---|---|
| committer | madmaxoft@gmail.com <madmaxoft@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6> | 2013-04-13 23:02:10 +0200 |
| commit | a49c004278b0e300521e9cedf44a46ac843a958b (patch) | |
| tree | cc268ccbd5b938be93923d9aced847572364e263 /source/Pickup.cpp | |
| parent | Fixed a bit of coding style and function names in cItem (diff) | |
| download | cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar.gz cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar.bz2 cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar.lz cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar.xz cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.tar.zst cuberite-a49c004278b0e300521e9cedf44a46ac843a958b.zip | |
Diffstat (limited to 'source/Pickup.cpp')
| -rw-r--r-- | source/Pickup.cpp | 9 |
1 files changed, 5 insertions, 4 deletions
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(); |