summaryrefslogtreecommitdiffstats
path: root/src/Entities/ProjectileEntity.h
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-27 00:29:14 +0100
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-02-27 00:33:52 +0100
commitbaf2d8892127cd6da9d2f6f2f8d991d617c87800 (patch)
tree2f3c2f8d3d9e2659f068e78017a934c195ba77f2 /src/Entities/ProjectileEntity.h
parentFixed a gcc warning in FastNBT.h. (diff)
downloadcuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar.gz
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar.bz2
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar.lz
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar.xz
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.tar.zst
cuberite-baf2d8892127cd6da9d2f6f2f8d991d617c87800.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/ProjectileEntity.h12
1 files changed, 9 insertions, 3 deletions
diff --git a/src/Entities/ProjectileEntity.h b/src/Entities/ProjectileEntity.h
index e80592999..fac592d16 100644
--- a/src/Entities/ProjectileEntity.h
+++ b/src/Entities/ProjectileEntity.h
@@ -46,7 +46,7 @@ public:
cProjectileEntity(eKind a_Kind, cEntity * a_Creator, double a_X, double a_Y, double a_Z, double a_Width, double a_Height);
cProjectileEntity(eKind a_Kind, cEntity * a_Creator, const Vector3d & a_Pos, const Vector3d & a_Speed, double a_Width, double a_Height);
- static cProjectileEntity * Create(eKind a_Kind, cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d * a_Speed = NULL);
+ static cProjectileEntity * Create(eKind a_Kind, cEntity * a_Creator, double a_X, double a_Y, double a_Z, const cItem & a_Item, const Vector3d * a_Speed = NULL);
/// Called by the physics blocktracer when the entity hits a solid block, the hit position and the face hit (BLOCK_FACE_) is given
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace);
@@ -305,13 +305,19 @@ public:
CLASS_PROTODEF(cFireworkEntity);
- cFireworkEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z);
+ cFireworkEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const cItem & a_Item);
+ const cItem & GetItem(void) const { return m_FireworkItem; }
protected:
// cProjectileEntity overrides:
- virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
virtual void HandlePhysics(float a_Dt, cChunk & a_Chunk) override;
+ virtual void Tick(float a_Dt, cChunk & a_Chunk) override;
+
+private:
+
+ int m_ExplodeTimer;
+ cItem m_FireworkItem;
// tolua_begin