summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSamuel Barney <samjbarney@gmail.com>2014-08-21 16:35:29 +0200
committerSamuel Barney <samjbarney@gmail.com>2014-08-21 16:35:29 +0200
commit07876e460c84be7b017369760f59bcb9b8d45d2f (patch)
tree6074756d5282e355f03f8e516c3a289d29324edf
parentRemoved more references to cNewMonster (diff)
downloadcuberite-07876e460c84be7b017369760f59bcb9b8d45d2f.tar
cuberite-07876e460c84be7b017369760f59bcb9b8d45d2f.tar.gz
cuberite-07876e460c84be7b017369760f59bcb9b8d45d2f.tar.bz2
cuberite-07876e460c84be7b017369760f59bcb9b8d45d2f.tar.lz
cuberite-07876e460c84be7b017369760f59bcb9b8d45d2f.tar.xz
cuberite-07876e460c84be7b017369760f59bcb9b8d45d2f.tar.zst
cuberite-07876e460c84be7b017369760f59bcb9b8d45d2f.zip
-rw-r--r--src/Mobs/Components/AIAggressiveComponent.h2
-rw-r--r--src/Mobs/Components/AIAggresssiveComponent.cpp4
-rw-r--r--src/Mobs/Components/AIComponent.cpp4
-rw-r--r--src/Mobs/Components/AIComponent.h6
-rw-r--r--src/Mobs/Components/AttackComponent.h6
-rw-r--r--src/Mobs/Components/EnvironmentComponent.h6
-rw-r--r--src/Mobs/Components/MovementComponent.h6
7 files changed, 17 insertions, 17 deletions
diff --git a/src/Mobs/Components/AIAggressiveComponent.h b/src/Mobs/Components/AIAggressiveComponent.h
index 73c0f972e..473a6d00d 100644
--- a/src/Mobs/Components/AIAggressiveComponent.h
+++ b/src/Mobs/Components/AIAggressiveComponent.h
@@ -7,7 +7,7 @@ protected:
enum MState{ATTACKING, IDLE, CHASING, ESCAPING} m_EMState;
cEntity * m_Target;
public:
- cAIAggressiveComponent(cNewMonster * a_Monster);
+ cAIAggressiveComponent(cMonster * a_Monster);
virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
diff --git a/src/Mobs/Components/AIAggresssiveComponent.cpp b/src/Mobs/Components/AIAggresssiveComponent.cpp
index 8bbe42b75..fd39e15fa 100644
--- a/src/Mobs/Components/AIAggresssiveComponent.cpp
+++ b/src/Mobs/Components/AIAggresssiveComponent.cpp
@@ -3,10 +3,10 @@
#include "AIAggressiveComponent.h"
#include <iostream>
-#include "../NewMonster.h"
+#include "../Monster.h"
-cAIAggressiveComponent::cAIAggressiveComponent(cNewMonster * a_Monster) : cAIComponent(a_Monster), m_Target(NULL){}
+cAIAggressiveComponent::cAIAggressiveComponent(cMonster * a_Monster) : cAIComponent(a_Monster), m_Target(NULL){}
void cAIAggressiveComponent::Tick(float a_Dt, cChunk & a_Chunk)
{
diff --git a/src/Mobs/Components/AIComponent.cpp b/src/Mobs/Components/AIComponent.cpp
index c7ac34947..b747bffd8 100644
--- a/src/Mobs/Components/AIComponent.cpp
+++ b/src/Mobs/Components/AIComponent.cpp
@@ -1,5 +1,5 @@
#include "Globals.h"
#include "AIComponent.h"
-#include "../NewMonster.h"
+#include "../Monster.h"
-cAIComponent::cAIComponent(cNewMonster * a_Entity) : m_Self(a_Entity){}
+cAIComponent::cAIComponent(cMonster * a_Entity) : m_Self(a_Entity){}
diff --git a/src/Mobs/Components/AIComponent.h b/src/Mobs/Components/AIComponent.h
index 0e43db3a0..d8bfe7900 100644
--- a/src/Mobs/Components/AIComponent.h
+++ b/src/Mobs/Components/AIComponent.h
@@ -1,15 +1,15 @@
#pragma once
-class cNewMonster;
+class cMonster;
class cEntity;
class cChunk;
class cAIComponent
{
protected:
- cNewMonster * m_Self;
+ cMonster * m_Self;
public:
- cAIComponent(cNewMonster * a_Entity);
+ cAIComponent(cMonster * a_Entity);
virtual ~cAIComponent(){}
virtual void Tick(float a_Dt, cChunk & a_Chunk){}
diff --git a/src/Mobs/Components/AttackComponent.h b/src/Mobs/Components/AttackComponent.h
index 4318070bd..ca0bbd815 100644
--- a/src/Mobs/Components/AttackComponent.h
+++ b/src/Mobs/Components/AttackComponent.h
@@ -1,15 +1,15 @@
#pragma once
-class cNewMonster;
+class cMonster;
class cEntity;
class cChunk;
class cAttackComponent
{
protected:
- cNewMonster * m_Self;
+ cMonster * m_Self;
public:
- cAttackComponent(cNewMonster * a_Entity);
+ cAttackComponent(cMonster * a_Entity);
virtual ~cAttackComponent(){}
virtual void Tick(float a_Dt, cChunk & a_Chunk){}
diff --git a/src/Mobs/Components/EnvironmentComponent.h b/src/Mobs/Components/EnvironmentComponent.h
index 0011b72e5..080ae3716 100644
--- a/src/Mobs/Components/EnvironmentComponent.h
+++ b/src/Mobs/Components/EnvironmentComponent.h
@@ -1,15 +1,15 @@
#pragma once
-class cNewMonster;
+class cMonster;
class cEntity;
class cChunk;
class cEnvironmentComponent
{
protected:
- cNewMonster * m_Self;
+ cMonster * m_Self;
public:
- cEnvironmentComponent(cNewMonster * a_Entity);
+ cEnvironmentComponent(cMonster * a_Entity);
virtual ~cEnvironmentComponent(){}
virtual void Tick(float a_Dt, cChunk & a_Chunk){}
diff --git a/src/Mobs/Components/MovementComponent.h b/src/Mobs/Components/MovementComponent.h
index 3b8b7e9eb..1c876728c 100644
--- a/src/Mobs/Components/MovementComponent.h
+++ b/src/Mobs/Components/MovementComponent.h
@@ -1,15 +1,15 @@
#pragma once
-class cNewMonster;
+class cMonster;
class cEntity;
class cChunk;
class cMovementComponent
{
protected:
- cNewMonster * m_Self;
+ cMonster * m_Self;
public:
- cMovementComponent(cNewMonster * a_Entity);
+ cMovementComponent(cMonster * a_Entity);
virtual ~cMovementComponent(){}
virtual void Tick(float a_Dt, cChunk & a_Chunk){}