flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Restructured cSplashPotionEntity code.

Browse Source 
The callback doesn't need declaration in the header.
Renamed PotionName to PotionParticleType.
This commit is contained in:
madmaxoft
2014-07-15 22:41:42 +02:00
parent f5259d7651
commit cc452f51c8
5 changed files with 103 additions and 71 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Entities/SplashPotionEntity.h
+18 -26
View File
@@ -25,43 +25,35 @@ public:
CLASS_PROTODEF(cSplashPotionEntity);
cSplashPotionEntity(cEntity * a_Creator, double a_X, double a_Y, double a_Z, const Vector3d & a_Speed, cEntityEffect::eType a_EntityEffectType, cEntityEffect a_EntityEffect, int a_PotionName);
cSplashPotionEntity(
cEntity * a_Creator,
double a_X, double a_Y, double a_Z,
const Vector3d & a_Speed,
cEntityEffect::eType a_EntityEffectType,
cEntityEffect a_EntityEffect,
int a_PotionParticleType
);
cEntityEffect::eType GetEntityEffectType() { return m_EntityEffectType; }
cEntityEffect GetEntityEffect() { return m_EntityEffect; }
int GetPotionName() { return m_PotionName; }
cEntityEffect::eType GetEntityEffectType (void) const { return m_EntityEffectType; }
cEntityEffect GetEntityEffect (void) const { return m_EntityEffect; }
int GetPotionParticleType(void) const { return m_PotionParticleType; }
void SetEntityEffectType(cEntityEffect::eType a_EntityEffectType) { m_EntityEffectType = a_EntityEffectType; }
void SetEntityEffect(cEntityEffect a_EntityEffect) { m_EntityEffect = a_EntityEffect; }
void SetPotionName(int a_PotionName) { m_PotionName = a_PotionName; }
void SetPotionParticleType(int a_PotionParticleType) { m_PotionParticleType = a_PotionParticleType; }
protected:
cEntityEffect::eType m_EntityEffectType;
cEntityEffect m_EntityEffect;
int m_PotionParticleType;
// cProjectileEntity overrides:
virtual void OnHitSolidBlock(const Vector3d & a_HitPos, eBlockFace a_HitFace) override;
virtual void OnHitEntity (cEntity & a_EntityHit, const Vector3d & a_HitPos) override;
/** Splashes the potion, fires its particle effects and sounds
* @param a_HitPos The position where the potion will splash
*/
@param a_HitPos The position where the potion will splash */
void Splash(const Vector3d & a_HitPos);
cEntityEffect::eType m_EntityEffectType;
cEntityEffect m_EntityEffect;
int m_PotionName;
class cSplashPotionCallback :
public cEntityCallback
{
public:
cSplashPotionCallback(const Vector3d & a_HitPos, cEntityEffect::eType &a_EntityEffectType, cEntityEffect &a_EntityEffect);
virtual bool Item(cEntity *a_Entity) override;
private:
const Vector3d &m_HitPos;
cEntityEffect::eType &m_EntityEffectType;
cEntityEffect &m_EntityEffect;
};
} ; // tolua_export