diff options
| author | archshift <admin@archshift.com> | 2014-07-20 22:11:06 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-07-26 12:48:16 +0200 |
| commit | 60d4a165140b3b1c5202c21fd197b61cae18077c (patch) | |
| tree | bcbeaad5e2d921cfbbeccd81faba132cd61447b4 /src/Entities | |
| parent | Moved potion static functions to EntityEffect to create splash potions through world (diff) | |
| download | cuberite-60d4a165140b3b1c5202c21fd197b61cae18077c.tar cuberite-60d4a165140b3b1c5202c21fd197b61cae18077c.tar.gz cuberite-60d4a165140b3b1c5202c21fd197b61cae18077c.tar.bz2 cuberite-60d4a165140b3b1c5202c21fd197b61cae18077c.tar.lz cuberite-60d4a165140b3b1c5202c21fd197b61cae18077c.tar.xz cuberite-60d4a165140b3b1c5202c21fd197b61cae18077c.tar.zst cuberite-60d4a165140b3b1c5202c21fd197b61cae18077c.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/EntityEffect.cpp | 2 | ||||
| -rw-r--r-- | src/Entities/EntityEffect.h | 3 | ||||
| -rw-r--r-- | src/Entities/SplashPotionEntity.cpp | 3 |
3 files changed, 2 insertions, 6 deletions
diff --git a/src/Entities/EntityEffect.cpp b/src/Entities/EntityEffect.cpp index f58738aef..fdcbe822e 100644 --- a/src/Entities/EntityEffect.cpp +++ b/src/Entities/EntityEffect.cpp @@ -38,7 +38,7 @@ cEntityEffect::eType cEntityEffect::GetPotionEffectType(short a_ItemDamage) case 0x0d: return cEntityEffect::effWaterBreathing; case 0x0e: return cEntityEffect::effInvisibility; - // No effect potions + // No effect potions case 0x00: case 0x07: case 0x0b: // Will be potion of leaping in 1.8 diff --git a/src/Entities/EntityEffect.h b/src/Entities/EntityEffect.h index 04e25e303..f9c1e4eb2 100644 --- a/src/Entities/EntityEffect.h +++ b/src/Entities/EntityEffect.h @@ -44,8 +44,7 @@ public: static cEntityEffect::eType GetPotionEffectType(short a_ItemDamage); - /** Retrieves the intensity level from the potion's damage value. - Returns 0 for level I potions, 1 for level II potions. */ + /** Retrieves the intensity level from the potion's damage value. Returns 0 for level I potions, 1 for level II potions. */ static short GetPotionEffectIntensity(short a_ItemDamage); diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp index d874a86e1..ed16f060d 100644 --- a/src/Entities/SplashPotionEntity.cpp +++ b/src/Entities/SplashPotionEntity.cpp @@ -75,9 +75,6 @@ cSplashPotionEntity::cSplashPotionEntity( cItem a_Item ) : super(pkSplashPotion, a_Creator, a_X, a_Y, a_Z, 0.25, 0.25), - m_EntityEffectType(cEntityEffect::effNoEffect), - m_EntityEffect(cEntityEffect()), - m_PotionColor(0), m_DestroyTimer(-1) { SetSpeed(a_Speed); |