From 071aee6c79534ad7181a7dd72db11041268b0de1 Mon Sep 17 00:00:00 2001 From: Tiger Wang Date: Fri, 28 Aug 2020 21:35:38 +0100 Subject: Clean up pickup collection to use ForEachEntityInBox --- src/Chunk.cpp | 36 ------------------------------------ 1 file changed, 36 deletions(-) (limited to 'src/Chunk.cpp') diff --git a/src/Chunk.cpp b/src/Chunk.cpp index ea9862c6a..497205667 100644 --- a/src/Chunk.cpp +++ b/src/Chunk.cpp @@ -1496,42 +1496,6 @@ void cChunk::SetAreaBiome(int a_MinRelX, int a_MaxRelX, int a_MinRelZ, int a_Max -void cChunk::CollectPickupsByPlayer(cPlayer & a_Player) -{ - auto BoundingBox = a_Player.GetBoundingBox(); - BoundingBox.Expand(1, 0.5, 1); - - for (auto & Entity : m_Entities) - { - if ((!Entity->IsPickup()) && (!Entity->IsProjectile())) - { - continue; // Only pickups and projectiles can be picked up - } - - if (BoundingBox.IsInside(Entity->GetPosition())) - { - /* - LOG("Pickup %d being collected by player \"%s\", distance %f", - (*itr)->GetUniqueID(), a_Player->GetName().c_str(), SqrDist - ); - */ - MarkDirty(); - if (Entity->IsPickup()) - { - static_cast(*Entity).CollectedBy(a_Player); - } - else - { - static_cast(*Entity).CollectedBy(a_Player); - } - } - } -} - - - - - bool cChunk::SetSignLines(int a_PosX, int a_PosY, int a_PosZ, const AString & a_Line1, const AString & a_Line2, const AString & a_Line3, const AString & a_Line4) { // Also sends update packets to all clients in the chunk -- cgit v1.2.3