diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-03-09 22:43:15 +0100 |
|---|---|---|
| committer | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-03-09 22:43:15 +0100 |
| commit | 1985a9c33edc5b929f88871ce553b148408571af (patch) | |
| tree | 08124cd9f2ea2171710b2dfb764d6b7dfee5701f /src/Entities/ProjectileEntity.h | |
| parent | Mentiod that we use some c++11 exstensions (diff) | |
| parent | != FACE_NONE (diff) | |
| download | cuberite-1985a9c33edc5b929f88871ce553b148408571af.tar cuberite-1985a9c33edc5b929f88871ce553b148408571af.tar.gz cuberite-1985a9c33edc5b929f88871ce553b148408571af.tar.bz2 cuberite-1985a9c33edc5b929f88871ce553b148408571af.tar.lz cuberite-1985a9c33edc5b929f88871ce553b148408571af.tar.xz cuberite-1985a9c33edc5b929f88871ce553b148408571af.tar.zst cuberite-1985a9c33edc5b929f88871ce553b148408571af.zip | |
Diffstat (limited to 'src/Entities/ProjectileEntity.h')
| -rw-r--r-- | src/Entities/ProjectileEntity.h | 12 |
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 |