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/Items/ItemPotion.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/Items/ItemPotion.h')
| -rw-r--r-- | src/Items/ItemPotion.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Items/ItemPotion.h b/src/Items/ItemPotion.h index f3afbf99b..f16d89b39 100644 --- a/src/Items/ItemPotion.h +++ b/src/Items/ItemPotion.h @@ -17,8 +17,8 @@ public: } - /** Returns the potion particle type (used by the client for visuals), based on the potion's damage value */ - static int GetPotionParticleType(short a_ItemDamage) + /** Returns the potion color (used by the client for visuals), based on the potion's damage value */ + static int GetPotionColor(short a_ItemDamage) { // Lowest six bits return (a_ItemDamage & 0x3f); @@ -156,7 +156,7 @@ public: cSplashPotionEntity * Projectile = new cSplashPotionEntity( a_Player, Pos.x, Pos.y, Pos.z, Speed, GetEntityEffectType(PotionDamage), cEntityEffect(GetEntityEffectDuration(PotionDamage), - GetEntityEffectIntensity(PotionDamage)), GetPotionParticleType(PotionDamage) + GetEntityEffectIntensity(PotionDamage)), GetPotionColor(PotionDamage) ); if (Projectile == NULL) { |