summaryrefslogtreecommitdiffstats
path: root/src/Entities
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-04-27 02:08:39 +0200
committerarchshift <admin@archshift.com>2014-04-27 02:08:39 +0200
commitbc5c28a0beef335edf3b930e069b9152ef0a912f (patch)
tree19cefeeef25f834328314cf24ec09a8ef2d80e33 /src/Entities
parentMoved cThrownEggEntity out of ProjectileEntity.h (diff)
downloadcuberite-bc5c28a0beef335edf3b930e069b9152ef0a912f.tar
cuberite-bc5c28a0beef335edf3b930e069b9152ef0a912f.tar.gz
cuberite-bc5c28a0beef335edf3b930e069b9152ef0a912f.tar.bz2
cuberite-bc5c28a0beef335edf3b930e069b9152ef0a912f.tar.lz
cuberite-bc5c28a0beef335edf3b930e069b9152ef0a912f.tar.xz
cuberite-bc5c28a0beef335edf3b930e069b9152ef0a912f.tar.zst
cuberite-bc5c28a0beef335edf3b930e069b9152ef0a912f.zip
Diffstat (limited to 'src/Entities')
-rw-r--r--src/Entities/ProjectileEnderPearl.cpp54
-rw-r--r--src/Entities/ProjectileEnderPearl.h39
-rw-r--r--src/Entities/ProjectileEntity.cpp55
-rw-r--r--src/Entities/ProjectileEntity.h32
4 files changed, 94 insertions, 86 deletions
diff --git a/src/Entities/ProjectileEnderPearl.cpp b/src/Entities/ProjectileEnderPearl.cpp
new file mode 100644
index 000000000..4e848f189
--- /dev/null
+++ b/src/Entities/ProjectileEnderPearl.cpp
@@ -0,0 +1,54 @@
+#include "Globals.h" // NOTE: MSVC stupidness requires this to be the same across all modules
+
+#include "ProjectileEnderPearl.h"
+
+
+
+
+
+cThrownEnderPearlEntity::cThrownEnderPearlEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
+super(pkEnderPearl, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
+{
+ SetSpeed(a_Speed);
+}
+
+
+
+
+
+void cThrownEnderPearlEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
+{
+ // TODO: Tweak a_HitPos based on block face.
+ TeleportCreator(a_HitPos);
+
+ Destroy();
+}
+
+
+
+
+
+void cThrownEnderPearlEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
+{
+ int TotalDamage = 0;
+ // TODO: If entity is Ender Crystal, destroy it
+
+ TeleportCreator(a_HitPos);
+ a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
+
+ Destroy(true);
+}
+
+
+
+
+
+void cThrownEnderPearlEntity::TeleportCreator(const Vector3d & a_HitPos)
+{
+ // Teleport the creator here, make them take 5 damage:
+ if (m_Creator != NULL)
+ {
+ m_Creator->TeleportToCoords(a_HitPos.x + 0.5, a_HitPos.y + 1.7, a_HitPos.z + 0.5);
+ m_Creator->TakeDamage(dtEnderPearl, this, 5, 0);
+ }
+} \ No newline at end of file
diff --git a/src/Entities/ProjectileEnderPearl.h b/src/Entities/ProjectileEnderPearl.h
new file mode 100644
index 000000000..d6d052428
--- /dev/null
+++ b/src/Entities/ProjectileEnderPearl.h
@@ -0,0 +1,39 @@
+//
+// ProjectileEnderPearl.h
+//
+
+#pragma once
+
+#include "ProjectileEntity.h"
+
+
+
+
+
+class cThrownEnderPearlEntity :
+public cProjectileEntity
+{
+ typedef cProjectileEntity super;
+
+public:
+
+ // tolua_end
+
+ CLASS_PROTODEF(cThrownEnderPearlEntity);
+
+ cThrownEnderPearlEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed);
+
+protected:
+
+ // tolua_end
+
+ // cProjectileEntity overrides:
+ virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
+ virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
+
+ // Teleports the creator where the ender pearl lands.
+ void TeleportCreator(const Vector3d & a_HitPos);
+
+ // tolua_begin
+
+} ; \ No newline at end of file
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index b4c162e35..d7e1f56a7 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -15,6 +15,7 @@
#include "ProjectileArrow.h"
#include "ProjectileEgg.h"
+#include "ProjectileEnderPearl.h"
@@ -410,60 +411,6 @@ void cProjectileEntity::CollectedBy(cPlayer * a_Dest)
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// cThrownEnderPearlEntity :
-
-cThrownEnderPearlEntity::cThrownEnderPearlEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
- super(pkEnderPearl, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25)
-{
- SetSpeed(a_Speed);
-}
-
-
-
-
-
-void cThrownEnderPearlEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
-{
- // TODO: Tweak a_HitPos based on block face.
- TeleportCreator(a_HitPos);
-
- Destroy();
-}
-
-
-
-
-
-void cThrownEnderPearlEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
-{
- int TotalDamage = 0;
- // TODO: If entity is Ender Crystal, destroy it
-
- TeleportCreator(a_HitPos);
- a_EntityHit.TakeDamage(dtRangedAttack, this, TotalDamage, 1);
-
- Destroy(true);
-}
-
-
-
-
-
-void cThrownEnderPearlEntity::TeleportCreator(const Vector3d & a_HitPos)
-{
- // Teleport the creator here, make them take 5 damage:
- if (m_Creator != NULL)
- {
- m_Creator->TeleportToCoords(a_HitPos.x + 0.5, a_HitPos.y + 1.7, a_HitPos.z + 0.5);
- m_Creator->TakeDamage(dtEnderPearl, this, 5, 0);
- }
-}
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
// cThrownSnowballEntity :
cThrownSnowballEntity::cThrownSnowballEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
diff --git a/src/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h
index 74f72c5d1..5523e2f8b 100644
--- a/src/Entities/ProjectileEntity.h
+++ b/src/Entities/ProjectileEntity.h
@@ -101,38 +101,6 @@ protected:
-class cThrownEnderPearlEntity :
- public cProjectileEntity
-{
- typedef cProjectileEntity super;
-
-public:
-
- // tolua_end
-
- CLASS_PROTODEF(cThrownEnderPearlEntity);
-
- cThrownEnderPearlEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed);
-
-protected:
-
- // tolua_end
-
- // cProjectileEntity overrides:
- virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
- virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
-
- // Teleports the creator where the ender pearl lands.
- void TeleportCreator(const Vector3d & a_HitPos);
-
- // tolua_begin
-
-} ;
-
-
-
-
-
class cThrownSnowballEntity :
public cProjectileEntity
{