From ff762a7ece6400eaeb5e21f3fea7cad00786a8d9 Mon Sep 17 00:00:00 2001 From: madmaxoft Date: Thu, 5 Sep 2013 22:40:08 +0200 Subject: [PATCH] Moved daylight burning directly into cMonster. --- source/Mobs/Monster.cpp | 36 ++++++++++++++++++++++++++++++++++++ source/Mobs/Monster.h | 7 +++++++ source/Mobs/Skeleton.cpp | 19 +------------------ source/Mobs/Skeleton.h | 1 - source/Mobs/Zombie.cpp | 20 +------------------- source/Mobs/Zombie.h | 3 +-- 6 files changed, 46 insertions(+), 40 deletions(-) diff --git a/source/Mobs/Monster.cpp b/source/Mobs/Monster.cpp index 9ae91f1e0..11b530968 100644 --- a/source/Mobs/Monster.cpp +++ b/source/Mobs/Monster.cpp @@ -15,6 +15,7 @@ #include "../Vector3i.h" #include "../Vector3d.h" #include "../Tracer.h" +#include "../Chunk.h" // #include "../../iniFile/iniFile.h" @@ -100,6 +101,9 @@ void cMonster::Tick(float a_Dt, cChunk & a_Chunk) return; } + // Burning in daylight + HandleDaylightBurning(a_Chunk); + HandlePhysics(a_Dt,a_Chunk); BroadcastMovementUpdate(); @@ -473,3 +477,35 @@ void cMonster::AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsigned + +void cMonster::HandleDaylightBurning(cChunk & a_Chunk) +{ + if (!m_BurnsInDaylight) + { + return; + } + + int RelY = (int)floor(GetPosY()); + if ((RelY < 0) || (RelY >= cChunkDef::Height)) + { + // Outside the world + return; + } + + int RelX = (int)floor(GetPosX()) - a_Chunk.GetPosX() * cChunkDef::Width; + int RelZ = (int)floor(GetPosZ()) - a_Chunk.GetPosZ() * cChunkDef::Width; + if ( + (a_Chunk.GetSkyLight(RelX, RelY, RelZ) == 15) && // In the daylight + (a_Chunk.GetBlock(RelX, RelY, RelZ) != E_BLOCK_SOULSAND) && // Not on soulsand + (GetWorld()->GetTimeOfDay() < (12000 + 1000)) && // It is nighttime + !IsOnFire() // Not already burning + ) + { + // Burn for 100 ticks, then decide again + StartBurning(100); + } +} + + + + diff --git a/source/Mobs/Monster.h b/source/Mobs/Monster.h index 755678d39..5f33d4450 100644 --- a/source/Mobs/Monster.h +++ b/source/Mobs/Monster.h @@ -107,6 +107,9 @@ public: void SetAttackDamage(float ad); void SetSightDistance(float sd); + /// Sets whether the mob burns in daylight. Only evaluated at next burn-decision tick + void SetBurnsInDaylight(bool a_BurnsInDaylight) { a_BurnsInDaylight = a_BurnsInDaylight; } + enum MState{ATTACKING, IDLE, CHASING, ESCAPING} m_EMState; enum MPersonality{PASSIVE,AGGRESSIVE,COWARDLY} m_EMPersonality; @@ -134,8 +137,12 @@ protected: float m_AttackDamage; float m_AttackRange; float m_AttackInterval; + + bool m_BurnsInDaylight; void AddRandomDropItem(cItems & a_Drops, unsigned int a_Min, unsigned int a_Max, short a_Item, short a_ItemHealth = 0); + + void HandleDaylightBurning(cChunk & a_Chunk); } ; // tolua_export diff --git a/source/Mobs/Skeleton.cpp b/source/Mobs/Skeleton.cpp index ad4037db9..10dad4065 100644 --- a/source/Mobs/Skeleton.cpp +++ b/source/Mobs/Skeleton.cpp @@ -11,24 +11,7 @@ cSkeleton::cSkeleton(void) : super("Skeleton", 51, "mob.skeleton.hurt", "mob.skeleton.death", 0.6, 1.8) { -} - - - - - -void cSkeleton::Tick(float a_Dt, cChunk & a_Chunk) -{ - cMonster::Tick(a_Dt, a_Chunk); - - if ((GetWorld()->GetBlockSkyLight(GetPosX(), GetPosY(), GetPosZ()) == 15) && (GetWorld()->GetBlock(GetPosX(), GetPosY(), GetPosZ()) != E_BLOCK_SOULSAND)) - { - if ((GetWorld()->GetTimeOfDay() < (12000 + 1000)) && !IsOnFire()) - { - // Burn for 100 ticks, then decide again - StartBurning(100); - } - } + SetBurnsInDaylight(true); } diff --git a/source/Mobs/Skeleton.h b/source/Mobs/Skeleton.h index bc541bac2..d0a2da490 100644 --- a/source/Mobs/Skeleton.h +++ b/source/Mobs/Skeleton.h @@ -17,7 +17,6 @@ public: CLASS_PROTODEF(cSkeleton); - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; } ; diff --git a/source/Mobs/Zombie.cpp b/source/Mobs/Zombie.cpp index f3adf1283..9b238baef 100644 --- a/source/Mobs/Zombie.cpp +++ b/source/Mobs/Zombie.cpp @@ -8,28 +8,10 @@ -// They're eating your brains! - cZombie::cZombie(void) : super("Zombie", 54, "mob.zombie.hurt", "mob.zombie.death", 0.6, 1.8) { -} - - - - - -void cZombie::Tick(float a_Dt, cChunk & a_Chunk) -{ - super::Tick(a_Dt, a_Chunk); - if ((GetWorld()->GetBlockSkyLight(GetPosX(), GetPosY(), GetPosZ()) == 15) && (GetWorld()->GetBlock(GetPosX(), GetPosY(), GetPosZ()) != E_BLOCK_SOULSAND)) - { - if ((GetWorld()->GetTimeOfDay() < (12000 + 1000)) && !IsOnFire()) - { - // Burn for 100 ticks, then decide again - StartBurning(100); - } - } + SetBurnsInDaylight(true); } diff --git a/source/Mobs/Zombie.h b/source/Mobs/Zombie.h index 61f8e3bb8..4835a53c4 100644 --- a/source/Mobs/Zombie.h +++ b/source/Mobs/Zombie.h @@ -12,11 +12,10 @@ class cZombie : typedef cAggressiveMonster super; public: - cZombie(); + cZombie(void); CLASS_PROTODEF(cZombie); - virtual void Tick(float a_Dt, cChunk & a_Chunk) override; virtual void GetDrops(cItems & a_Drops, cEntity * a_Killer = NULL) override; } ;