From e8f230f24e55469f1aa832bc8dad73db8018ffe1 Mon Sep 17 00:00:00 2001 From: "lapayo94@gmail.com" Date: Sun, 25 Dec 2011 22:47:12 +0000 Subject: - Fixed Bug #99 -> Mobs no longer bother you in creative mode - refactored many things in the Monster system git-svn-id: http://mc-server.googlecode.com/svn/trunk@112 0a769ca7-a7f5-676a-18bf-c427514a06d6 --- source/cZombie.cpp | 61 ++++-------------------------------------------------- 1 file changed, 4 insertions(+), 57 deletions(-) (limited to 'source/cZombie.cpp') diff --git a/source/cZombie.cpp b/source/cZombie.cpp index 5569b42ff..4530cc42f 100644 --- a/source/cZombie.cpp +++ b/source/cZombie.cpp @@ -1,28 +1,7 @@ #include "cZombie.h" -#include "Vector3f.h" -#include "Vector3d.h" - -#include "Defines.h" - -#include "cRoot.h" -#include "cWorld.h" -#include "cPickup.h" -#include "cItem.h" -#include "cMonsterConfig.h" - -#include "cMCLogger.h" - -#ifndef _WIN32 -#include // rand() -#include -#endif - -cZombie::cZombie() : m_ChaseTime(999999) { - m_bBurnable = true; - m_EMPersonality = AGGRESSIVE; - m_bPassiveAggressive = false; - //m_AttackRate = 1; +cZombie::cZombie() +{ m_MobType = 54; GetMonsterConfig("Zombie"); } @@ -33,7 +12,6 @@ cZombie::~cZombie() bool cZombie::IsA( const char* a_EntityType ) { - //LOG("IsA( cZombie ) : %s", a_EntityType); if( strcmp( a_EntityType, "cZombie" ) == 0 ) return true; return cMonster::IsA( a_EntityType ); } @@ -41,6 +19,8 @@ bool cZombie::IsA( const char* a_EntityType ) void cZombie::Tick(float a_Dt) { cMonster::Tick(a_Dt); + + //TODO Same as in cSkeleton :D if (GetWorld()->GetWorldTime() < (12000 + 1000) ) { //if daylight m_EMMetaState = BURNING; // BURN, BABY, BURN! >:D } @@ -50,38 +30,5 @@ void cZombie::KilledBy( cEntity* a_Killer ) { cMonster::RandomDropItem(E_ITEM_ROTTEN_FLESH, 0, 2); - cMonster::KilledBy( a_Killer ); } - -//What to do if in Idle State -void cZombie::InStateIdle(float a_Dt) { - cMonster::InStateIdle(a_Dt); -} - -//What to do if in Chasing State -void cZombie::InStateChasing(float a_Dt) { - cMonster::InStateChasing(a_Dt); - m_ChaseTime += a_Dt; - if( m_Target ) - { - Vector3f Pos = Vector3f( m_Pos ); - Vector3f Their = Vector3f( m_Target->GetPosition() ); - if( (Their - Pos).Length() <= m_AttackRange) { - cMonster::Attack(a_Dt); - } - MoveToPosition( Their + Vector3f(0, 0.65f, 0) ); - } else if( m_ChaseTime > 5.f ) { - m_ChaseTime = 0; - m_EMState = IDLE; - } -} - -void cZombie::InStateEscaping(float a_Dt) { - cMonster::InStateEscaping(a_Dt); -} - -void cZombie::GetMonsterConfig(const char* pm_name) { - LOG("I am gettin my attributes: %s", pm_name); - cRoot::Get()->GetMonsterConfig()->Get()->AssignAttributes(this,pm_name); -} -- cgit v1.2.3