From 3dc3e5eca7358a09c7be412b6b735cd38a3eced3 Mon Sep 17 00:00:00 2001 From: STRWarrior Date: Sat, 2 Nov 2013 20:45:51 +0100 Subject: Zombies and Skeletons don't walk into the sun anymore. --- source/Mobs/Skeleton.cpp | 15 +++++++++++++++ source/Mobs/Skeleton.h | 1 + source/Mobs/Zombie.cpp | 15 +++++++++++++++ source/Mobs/Zombie.h | 1 + 4 files changed, 32 insertions(+) (limited to 'source/Mobs') diff --git a/source/Mobs/Skeleton.cpp b/source/Mobs/Skeleton.cpp index 37a724848..3ca3ebbf7 100644 --- a/source/Mobs/Skeleton.cpp +++ b/source/Mobs/Skeleton.cpp @@ -3,6 +3,8 @@ #include "Skeleton.h" #include "../World.h" +#include "../Entities/ProjectileEntity.h" +#include "../Entities/Entity.h" @@ -28,3 +30,16 @@ void cSkeleton::GetDrops(cItems & a_Drops, cEntity * a_Killer) + +void cSkeleton::MoveToPosition(const Vector3f & a_Position) +{ + m_Destination = a_Position; + + // If the destination is in the sun and if it is not night AND the skeleton isn't on fire then block the movement. + if ((m_World->GetBlockSkyLight((int) a_Position.x, (int) a_Position.y, (int) a_Position.z) == 15) && (m_World->GetTimeOfDay() < 13187) && !IsOnFire()) + { + m_bMovingToDestination = false; + return; + } + m_bMovingToDestination = true; +} \ No newline at end of file diff --git a/source/Mobs/Skeleton.h b/source/Mobs/Skeleton.h index 7a4af7e22..6cede1d22 100644 --- a/source/Mobs/Skeleton.h +++ b/source/Mobs/Skeleton.h @@ -18,6 +18,7 @@ public: CLASS_PROTODEF(cSkeleton); virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; + virtual void MoveToPosition(const Vector3f & a_Position) override; bool IsWither(void) const { return m_bIsWither; }; private: diff --git a/source/Mobs/Zombie.cpp b/source/Mobs/Zombie.cpp index 1752ec390..a485d2b55 100644 --- a/source/Mobs/Zombie.cpp +++ b/source/Mobs/Zombie.cpp @@ -30,3 +30,18 @@ void cZombie::GetDrops(cItems & a_Drops, cEntity * a_Killer) + +void cZombie::MoveToPosition(const Vector3f & a_Position) +{ + m_Destination = a_Position; + + // If the destination is in the sun and if it is not night AND the skeleton isn't on fire then block the movement. + if ((m_World->GetBlockSkyLight((int) a_Position.x, (int) a_Position.y, (int) a_Position.z) == 15) && (m_World->GetTimeOfDay() < 13187) && !IsOnFire()) + { + m_bMovingToDestination = false; + return; + } + m_bMovingToDestination = true; +} + + diff --git a/source/Mobs/Zombie.h b/source/Mobs/Zombie.h index 148b1121e..7e14fe42f 100644 --- a/source/Mobs/Zombie.h +++ b/source/Mobs/Zombie.h @@ -17,6 +17,7 @@ public: CLASS_PROTODEF(cZombie); virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; + virtual void MoveToPosition(const Vector3f & a_Position) override; bool IsVillagerZombie(void) const {return m_bIsVillagerZombie; } bool IsConverting(void) const {return m_bIsConverting; } -- cgit v1.2.3