From e8f230f24e55469f1aa832bc8dad73db8018ffe1 Mon Sep 17 00:00:00 2001
From: "lapayo94@gmail.com"
 <lapayo94@gmail.com@0a769ca7-a7f5-676a-18bf-c427514a06d6>
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/cCavespider.cpp | 60 +++-----------------------------------------------
 1 file changed, 3 insertions(+), 57 deletions(-)

(limited to 'source/cCavespider.cpp')

diff --git a/source/cCavespider.cpp b/source/cCavespider.cpp
index dc0377edf..f31f229e3 100644
--- a/source/cCavespider.cpp
+++ b/source/cCavespider.cpp
@@ -1,28 +1,7 @@
 #include "cCavespider.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 <stdlib.h> // rand()
-#include <cstring>
-#endif
-
-cCavespider::cCavespider() : m_ChaseTime(999999) {
-	m_bBurnable = true;
-	m_EMPersonality = AGGRESSIVE;
-	m_bPassiveAggressive = true;
-	//m_AttackRate = 1;
+cCavespider::cCavespider()
+{
 	m_MobType = 59;
 	GetMonsterConfig("Cavespider");
 }
@@ -33,7 +12,6 @@ cCavespider::~cCavespider()
 
 bool cCavespider::IsA( const char* a_EntityType )
 {
-    //LOG("IsA( cCavespider ) : %s", a_EntityType);
 	if( strcmp( a_EntityType, "cCavespider" ) == 0 ) return true;
 	return cMonster::IsA( a_EntityType );
 }
@@ -41,7 +19,7 @@ bool cCavespider::IsA( const char* a_EntityType )
 void cCavespider::Tick(float a_Dt)
 {
 	cMonster::Tick(a_Dt);
-	m_EMPersonality = (GetWorld()->GetWorldTime() < (12000 + 1000) )? PASSIVE:AGGRESSIVE;
+	m_EMPersonality = (GetWorld()->GetWorldTime() < (12000 + 1000) ) ? PASSIVE : AGGRESSIVE;
 }
 
 void cCavespider::KilledBy( cEntity* a_Killer )
@@ -52,35 +30,3 @@ void cCavespider::KilledBy( cEntity* a_Killer )
 
 	cMonster::KilledBy( a_Killer );
 }
-
-//What to do if in Idle State
-void cCavespider::InStateIdle(float a_Dt) {
-	cMonster::InStateIdle(a_Dt);	
-}
-
-//What to do if in Chasing State
-void cCavespider::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 cCavespider::InStateEscaping(float a_Dt) {
-	cMonster::InStateEscaping(a_Dt);
-}
-
-void cCavespider::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