summaryrefslogtreecommitdiffstats
path: root/src/Mobs
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/Mobs/Creeper.cpp9
-rw-r--r--src/Mobs/EnderDragon.cpp2
-rw-r--r--src/Mobs/Monster.cpp2
-rw-r--r--src/Mobs/PassiveMonster.cpp2
-rw-r--r--src/Mobs/Path.cpp11
-rw-r--r--src/Mobs/PathFinder.cpp7
6 files changed, 11 insertions, 22 deletions
diff --git a/src/Mobs/Creeper.cpp b/src/Mobs/Creeper.cpp
index 29b402938..e824c7352 100644
--- a/src/Mobs/Creeper.cpp
+++ b/src/Mobs/Creeper.cpp
@@ -83,11 +83,10 @@ void cCreeper::GetDrops(cItems & a_Drops, cEntity * a_Killer)
{
auto ProjectileCreatorCallback = [](cEntity & a_Entity)
{
- if (a_Entity.IsMob() && ((static_cast<cMonster &>(a_Entity)).GetMobType() == mtSkeleton))
- {
- return true;
- }
- return false;
+ return (
+ a_Entity.IsMob() &&
+ ((static_cast<cMonster &>(a_Entity)).GetMobType() == mtSkeleton)
+ );
};
if (GetWorld()->DoWithEntityByID(static_cast<cProjectileEntity *>(a_Killer)->GetCreatorUniqueID(), ProjectileCreatorCallback))
diff --git a/src/Mobs/EnderDragon.cpp b/src/Mobs/EnderDragon.cpp
index d6b71552e..a3ba5f937 100644
--- a/src/Mobs/EnderDragon.cpp
+++ b/src/Mobs/EnderDragon.cpp
@@ -19,7 +19,7 @@ cEnderDragon::cEnderDragon(void) :
void cEnderDragon::GetDrops(cItems & a_Drops, cEntity * a_Killer)
{
- return;
+ // No drops
}
diff --git a/src/Mobs/Monster.cpp b/src/Mobs/Monster.cpp
index da09050cf..75bda197f 100644
--- a/src/Mobs/Monster.cpp
+++ b/src/Mobs/Monster.cpp
@@ -325,7 +325,7 @@ void cMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
else
{
// Note that m_NextWayPointPosition is actually returned by GetNextWayPoint)
- switch (m_PathFinder.GetNextWayPoint(*Chunk, GetPosition(), &m_FinalDestination, &m_NextWayPointPosition, m_EMState == IDLE ? true : false))
+ switch (m_PathFinder.GetNextWayPoint(*Chunk, GetPosition(), &m_FinalDestination, &m_NextWayPointPosition, m_EMState == IDLE))
{
case ePathFinderStatus::PATH_FOUND:
{
diff --git a/src/Mobs/PassiveMonster.cpp b/src/Mobs/PassiveMonster.cpp
index fa2874dcf..f9d5e4ba4 100644
--- a/src/Mobs/PassiveMonster.cpp
+++ b/src/Mobs/PassiveMonster.cpp
@@ -138,7 +138,7 @@ void cPassiveMonster::Tick(std::chrono::milliseconds a_Dt, cChunk & a_Chunk)
{
m_World->DoWithNearestPlayer(GetPosition(), static_cast<float>(m_SightDistance), [&](cPlayer & a_Player) -> bool
{
- cItem EquippedItem = a_Player.GetEquippedItem();
+ const cItem & EquippedItem = a_Player.GetEquippedItem();
if (FollowedItems.ContainsType(EquippedItem))
{
Vector3d PlayerPos = a_Player.GetPosition();
diff --git a/src/Mobs/Path.cpp b/src/Mobs/Path.cpp
index a2a5cf51c..378051163 100644
--- a/src/Mobs/Path.cpp
+++ b/src/Mobs/Path.cpp
@@ -639,15 +639,8 @@ bool cPath::SpecialIsSolidFromThisDirection(BLOCKTYPE a_Type, NIBBLETYPE a_Meta,
// If there is a nonsolid above a fence
if (!cBlockInfo::IsSolid(a_Type))
{
- // If we're coming from below
- if (a_Direction.y > 0)
- {
- return true; // treat the nonsolid as solid
- }
- else
- {
- return false; // Treat it as a nonsolid because we are not coming from below
- }
+ // Only treat as solid when we're coming from below
+ return (a_Direction.y > 0);
}
/* switch (a_Type)
diff --git a/src/Mobs/PathFinder.cpp b/src/Mobs/PathFinder.cpp
index f2542cebc..423c4a0c6 100644
--- a/src/Mobs/PathFinder.cpp
+++ b/src/Mobs/PathFinder.cpp
@@ -278,9 +278,6 @@ bool cPathFinder::PathIsTooOld() const
{
acceptableDeviation = 1;
}
- if ((m_FinalDestination - m_DeviationOrigin).SqrLength() > acceptableDeviation * acceptableDeviation)
- {
- return true;
- }
- return false;
+ const auto DeviationSqr = (m_FinalDestination - m_DeviationOrigin).SqrLength();
+ return (DeviationSqr > (acceptableDeviation * acceptableDeviation));
}