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/cSheep.cpp | 58 +------------------------------------------------------ 1 file changed, 1 insertion(+), 57 deletions(-) (limited to 'source/cSheep.cpp') diff --git a/source/cSheep.cpp b/source/cSheep.cpp index 8c82faa1f..6d2024d01 100644 --- a/source/cSheep.cpp +++ b/source/cSheep.cpp @@ -1,32 +1,9 @@ #include "cSheep.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: Implement color cSheep::cSheep() - : m_ChaseTime( 999999 ) - { - //LOG("SPAWNING A Sheep!!!!!!!!!!!!!!!!!!!!!"); - m_EMPersonality = PASSIVE; m_MobType = 91; GetMonsterConfig("Sheep"); } @@ -37,16 +14,10 @@ cSheep::~cSheep() bool cSheep::IsA( const char* a_EntityType ) { - //LOG("IsA( cSheep ) : %s", a_EntityType); if( strcmp( a_EntityType, "cSheep" ) == 0 ) return true; return cMonster::IsA( a_EntityType ); } -void cSheep::Tick(float a_Dt) -{ - cMonster::Tick(a_Dt); -} - void cSheep::KilledBy( cEntity* a_Killer ) { //Todo: Check wheather it is sheared @@ -55,31 +26,4 @@ void cSheep::KilledBy( cEntity* a_Killer ) cMonster::DropItem(E_ITEM_WHITE_CLOTH, 1); cMonster::KilledBy( a_Killer ); -} - -//What to do if in Idle State -void cSheep::InStateIdle(float a_Dt) { - cMonster::InStateIdle(a_Dt); -} - -//What to do if in Chasing State -void cSheep::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 cSheep::InStateEscaping(float a_Dt) { - cMonster::InStateEscaping(a_Dt); -} +} \ No newline at end of file -- cgit v1.2.3