summaryrefslogtreecommitdiffstats
path: root/src/Entities/ProjectileEntity.cpp
diff options
context:
space:
mode:
authorarchshift <admin@archshift.com>2014-04-27 02:35:31 +0200
committerarchshift <admin@archshift.com>2014-04-27 02:35:31 +0200
commitde7eaa573560253c9e78fbfa6614cd60763383bf (patch)
treef2f5837b30a6578929c8a754da2bf9f542fe82e3 /src/Entities/ProjectileEntity.cpp
parentMoved cThrownSnowballEntity out of ProjectileEntity.h (diff)
downloadcuberite-de7eaa573560253c9e78fbfa6614cd60763383bf.tar
cuberite-de7eaa573560253c9e78fbfa6614cd60763383bf.tar.gz
cuberite-de7eaa573560253c9e78fbfa6614cd60763383bf.tar.bz2
cuberite-de7eaa573560253c9e78fbfa6614cd60763383bf.tar.lz
cuberite-de7eaa573560253c9e78fbfa6614cd60763383bf.tar.xz
cuberite-de7eaa573560253c9e78fbfa6614cd60763383bf.tar.zst
cuberite-de7eaa573560253c9e78fbfa6614cd60763383bf.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/ProjectileEntity.cpp56
1 files changed, 2 insertions, 54 deletions
diff --git a/src/Entities/ProjectileEntity.cpp b/src/Entities/ProjectileEntity.cpp
index 6b137ebe7..ab7753d41 100644
--- a/src/Entities/ProjectileEntity.cpp
+++ b/src/Entities/ProjectileEntity.cpp
@@ -18,6 +18,7 @@
#include "ProjectileEnderPearl.h"
#include "ProjectileExpBottle.h"
#include "ProjectileSnowball.h"
+#include "ProjectileFireCharge.h"
@@ -520,57 +521,4 @@ void cGhastFireballEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a
{
Destroy();
Explode((int)floor(a_HitPos.x), (int)floor(a_HitPos.y), (int)floor(a_HitPos.z));
-}
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
-// cFireChargeEntity :
-
-cFireChargeEntity::cFireChargeEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed) :
- super(pkFireCharge, a_Creator, a_X, a_Y, a_Z, 0.3125, 0.3125)
-{
- SetSpeed(a_Speed);
- SetGravity(0);
-}
-
-
-
-
-
-void cFireChargeEntity::Explode(int a_BlockX, int a_BlockY, int a_BlockZ)
-{
- if (m_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ) == E_BLOCK_AIR)
- {
- m_World->SetBlock(a_BlockX, a_BlockY, a_BlockZ, E_BLOCK_FIRE, 1);
- }
-}
-
-
-
-
-
-void cFireChargeEntity::OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace)
-{
- Destroy();
- Explode((int)floor(a_HitPos.x), (int)floor(a_HitPos.y), (int)floor(a_HitPos.z));
-}
-
-
-
-
-
-void cFireChargeEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
-{
- Destroy();
- Explode((int)floor(a_HitPos.x), (int)floor(a_HitPos.y), (int)floor(a_HitPos.z));
-
- // TODO: Some entities are immune to hits
- a_EntityHit.StartBurning(5 * 20); // 5 seconds of burning
-}
-
-
-
-
+} \ No newline at end of file