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/cChicken.cpp | 63 ++--------------------------------------------------- 1 file changed, 2 insertions(+), 61 deletions(-) (limited to 'source/cChicken.cpp') diff --git a/source/cChicken.cpp b/source/cChicken.cpp index be740d6cd..33d5d0755 100644 --- a/source/cChicken.cpp +++ b/source/cChicken.cpp @@ -1,34 +1,10 @@ #include "cChicken.h" -#include "Vector3f.h" -#include "Vector3d.h" - -#include "Defines.h" - -#include "cRoot.h" -#include "cWorld.h" -#include "cPickup.h" -#include "cItem.h" - -#include "cMCLogger.h" - -#ifndef _WIN32 -#include // rand() -#include -#endif - -#include - - -// TODO: Drop egg every 5-10 minutes +//TODO Drop egg every 5-10 minutes cChicken::cChicken() - : m_ChaseTime( 999999 ) - { - //LOG("SPAWNING A CHICKEN!!!!!!!!!!!!!!!!!!!!!"); - m_EMPersonality = PASSIVE; m_MobType = 93; GetMonsterConfig("Chicken"); } @@ -39,16 +15,10 @@ cChicken::~cChicken() bool cChicken::IsA( const char* a_EntityType ) { - //LOG("IsA( cChicken ) : %s", a_EntityType); if( strcmp( a_EntityType, "cChicken" ) == 0 ) return true; return cMonster::IsA( a_EntityType ); } -void cChicken::Tick(float a_Dt) -{ - cMonster::Tick(a_Dt); -} - void cChicken::KilledBy( cEntity* a_Killer ) { //Drops 0-2 Feathers @@ -56,36 +26,7 @@ void cChicken::KilledBy( cEntity* a_Killer ) // Raw Chicken // TODO: (Check wheather it is burning to drop cooked Chicken) - //Drops 0-2 Lether cMonster::DropItem(E_ITEM_RAW_CHICKEN, 1); - cMonster::KilledBy( a_Killer ); -} - -//What to do if in Idle State -void cChicken::InStateIdle(float a_Dt) { - cMonster::InStateIdle(a_Dt); -} - -//What to do if in Chasing State -void cChicken::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 cChicken::InStateEscaping(float a_Dt) { - cMonster::InStateEscaping(a_Dt); -} +} \ No newline at end of file -- cgit v1.2.3