summaryrefslogtreecommitdiffstats
path: root/src/Entities/Player.cpp
diff options
context:
space:
mode:
authorpeterbell10 <peterbell10@live.co.uk>2017-09-11 23:20:49 +0200
committerMattes D <github@xoft.cz>2017-09-11 23:20:49 +0200
commite225b7f8262df48ad4d7094bc295add3007b0649 (patch)
treea42e9afcc88cfe6e9d1258458e3ad42764083d0e /src/Entities/Player.cpp
parentcBlockArea: change MakeIndex to return size_t (diff)
downloadcuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar.gz
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar.bz2
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar.lz
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar.xz
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.tar.zst
cuberite-e225b7f8262df48ad4d7094bc295add3007b0649.zip
Diffstat (limited to 'src/Entities/Player.cpp')
-rw-r--r--src/Entities/Player.cpp73
1 files changed, 17 insertions, 56 deletions
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 8d35d0bf5..8ce577b8f 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1005,36 +1005,21 @@ bool cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI)
void cPlayer::NotifyNearbyWolves(cPawn * a_Opponent, bool a_IsPlayerInvolved)
{
ASSERT(a_Opponent != nullptr);
- class LookForWolves : public cEntityCallback
- {
- public:
- cPlayer * m_Player;
- cPawn * m_Attacker;
- bool m_IsPlayerInvolved;
-
- LookForWolves(cPlayer * a_Me, cPawn * a_MyAttacker, bool a_PlayerInvolved) :
- m_Player(a_Me),
- m_Attacker(a_MyAttacker),
- m_IsPlayerInvolved(a_PlayerInvolved)
- {
- }
- virtual bool Item(cEntity * a_Entity) override
+ m_World->ForEachEntityInBox(cBoundingBox(GetPosition(), 16), [&] (cEntity & a_Entity)
{
- if (a_Entity->IsMob())
+ if (a_Entity.IsMob())
{
- cMonster * Mob = static_cast<cMonster*>(a_Entity);
- if (Mob->GetMobType() == mtWolf)
+ auto & Mob = static_cast<cMonster&>(a_Entity);
+ if (Mob.GetMobType() == mtWolf)
{
- cWolf * Wolf = static_cast<cWolf*>(Mob);
- Wolf->ReceiveNearbyFightInfo(m_Player->GetUUID(), m_Attacker, m_IsPlayerInvolved);
+ auto & Wolf = static_cast<cWolf&>(Mob);
+ Wolf.ReceiveNearbyFightInfo(GetUUID(), a_Opponent, a_IsPlayerInvolved);
}
}
return false;
}
- } Callback(this, a_Opponent, a_IsPlayerInvolved);
-
- m_World->ForEachEntityInBox(cBoundingBox(GetPosition(), 16), Callback);
+ );
}
@@ -2415,17 +2400,12 @@ void cPlayer::HandleFloater()
{
return;
}
- class cFloaterCallback :
- public cEntityCallback
- {
- public:
- virtual bool Item(cEntity * a_Entity) override
+ m_World->DoWithEntityByID(m_FloaterID, [](cEntity & a_Entity)
{
- a_Entity->Destroy(true);
+ a_Entity.Destroy(true);
return true;
}
- } Callback;
- m_World->DoWithEntityByID(m_FloaterID, Callback);
+ );
SetIsFishing(false);
}
@@ -2669,29 +2649,18 @@ bool cPlayer::DoesPlacingBlocksIntersectEntity(const sSetBlockVector & a_Blocks)
cWorld * World = GetWorld();
// Check to see if any entity intersects any block being placed
- class DoesIntersectBlock : public cEntityCallback
- {
- public:
- const std::vector<cBoundingBox> & m_BoundingBoxes;
-
- // The distance inside the block the entity can still be.
- const double EPSILON = 0.0005;
-
- DoesIntersectBlock(const std::vector<cBoundingBox> & a_BoundingBoxes) :
- m_BoundingBoxes(a_BoundingBoxes)
+ return !World->ForEachEntityInBox(PlacingBounds, [&](cEntity & a_Entity)
{
- }
+ // The distance inside the block the entity can still be.
+ const double EPSILON = 0.0005;
- virtual bool Item(cEntity * a_Entity) override
- {
- if (!a_Entity->DoesPreventBlockPlacement())
+ if (!a_Entity.DoesPreventBlockPlacement())
{
return false;
}
- cBoundingBox EntBox(a_Entity->GetPosition(), a_Entity->GetWidth() / 2, a_Entity->GetHeight());
- for (auto BlockBox: m_BoundingBoxes)
+ cBoundingBox EntBox(a_Entity.GetPosition(), a_Entity.GetWidth() / 2, a_Entity.GetHeight());
+ for (auto BlockBox : PlacementBoxes)
{
-
// Put in a little bit of wiggle room
BlockBox.Expand(-EPSILON, -EPSILON, -EPSILON);
if (EntBox.DoesIntersect(BlockBox))
@@ -2701,15 +2670,7 @@ bool cPlayer::DoesPlacingBlocksIntersectEntity(const sSetBlockVector & a_Blocks)
}
return false;
}
- } Callback(PlacementBoxes);
-
- // See if any entities in that bounding box collide with anyone
- if (!World->ForEachEntityInBox(PlacingBounds, Callback))
- {
- return true;
- }
-
- return false;
+ );
}