diff options
author | Mattes D <github@xoft.cz> | 2014-07-19 13:29:50 +0200 |
---|---|---|
committer | Mattes D <github@xoft.cz> | 2014-07-19 13:29:50 +0200 |
commit | e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686 (patch) | |
tree | ca52fbde3b744760e8dd9c1845d0ac7714a432ce /src/Entities/SplashPotionEntity.h | |
parent | Renamed AllToLua_lua script. (diff) | |
parent | Splash potions: Renamed PotionParticleType to PotionColor for clarity (diff) | |
download | cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar.gz cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar.bz2 cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar.lz cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar.xz cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.tar.zst cuberite-e9a9bbf02e563b9ea121aefe0f82ed5dd74d1686.zip |
Diffstat (limited to 'src/Entities/SplashPotionEntity.h')
-rw-r--r-- | src/Entities/SplashPotionEntity.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/Entities/SplashPotionEntity.h b/src/Entities/SplashPotionEntity.h index 2c78b55d2..a33b06990 100644 --- a/src/Entities/SplashPotionEntity.h +++ b/src/Entities/SplashPotionEntity.h @@ -31,22 +31,22 @@ public: const Vector3d & a_Speed, cEntityEffect::eType a_EntityEffectType, cEntityEffect a_EntityEffect, - int a_PotionParticleType + int a_PotionColor ); - cEntityEffect::eType GetEntityEffectType (void) const { return m_EntityEffectType; } - cEntityEffect GetEntityEffect (void) const { return m_EntityEffect; } - int GetPotionParticleType(void) const { return m_PotionParticleType; } + cEntityEffect::eType GetEntityEffectType(void) const { return m_EntityEffectType; } + cEntityEffect GetEntityEffect(void) const { return m_EntityEffect; } + int GetPotionColor(void) const { return m_PotionColor; } void SetEntityEffectType(cEntityEffect::eType a_EntityEffectType) { m_EntityEffectType = a_EntityEffectType; } void SetEntityEffect(cEntityEffect a_EntityEffect) { m_EntityEffect = a_EntityEffect; } - void SetPotionParticleType(int a_PotionParticleType) { m_PotionParticleType = a_PotionParticleType; } + void SetPotionColor(int a_PotionColor) { m_PotionColor = a_PotionColor; } protected: cEntityEffect::eType m_EntityEffectType; cEntityEffect m_EntityEffect; - int m_PotionParticleType; + int m_PotionColor; // cProjectileEntity overrides: @@ -56,4 +56,6 @@ protected: /** Splashes the potion, fires its particle effects and sounds @param a_HitPos The position where the potion will splash */ void Splash(const Vector3d & a_HitPos); + + virtual void SpawnOn(cClientHandle & a_Client) override; } ; // tolua_export |