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/cPig.cpp | 58 +-------------------------------------------------------- 1 file changed, 1 insertion(+), 57 deletions(-) (limited to 'source/cPig.cpp') diff --git a/source/cPig.cpp b/source/cPig.cpp index 926bd8df0..079b5f3e5 100644 --- a/source/cPig.cpp +++ b/source/cPig.cpp @@ -1,32 +1,9 @@ #include "cPig.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 - cPig::cPig() - : m_ChaseTime( 999999 ) - { - //LOG("SPAWNING A Pig!!!!!!!!!!!!!!!!!!!!!"); - m_EMPersonality = PASSIVE; m_MobType = 90; GetMonsterConfig("Pig"); } @@ -37,16 +14,10 @@ cPig::~cPig() bool cPig::IsA( const char* a_EntityType ) { - //LOG("IsA( cPig ) : %s", a_EntityType); if( strcmp( a_EntityType, "cPig" ) == 0 ) return true; return cMonster::IsA( a_EntityType ); } -void cPig::Tick(float a_Dt) -{ - cMonster::Tick(a_Dt); -} - void cPig::KilledBy( cEntity* a_Killer ) { //Drops 0-2 meat @@ -55,31 +26,4 @@ void cPig::KilledBy( cEntity* a_Killer ) //TODO: Check for burning state cMonster::KilledBy( a_Killer ); -} - -//What to do if in Idle State -void cPig::InStateIdle(float a_Dt) { - cMonster::InStateIdle(a_Dt); -} - -//What to do if in Chasing State -void cPig::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 cPig::InStateEscaping(float a_Dt) { - cMonster::InStateEscaping(a_Dt); -} +} \ No newline at end of file -- cgit v1.2.3