diff options
| author | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-11-24 15:43:05 +0100 |
|---|---|---|
| committer | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-11-24 15:43:05 +0100 |
| commit | 412e5155a24339aa2a86f36e0ae5a9c5a0ff758d (patch) | |
| tree | d63858a16962f83d68620bc55c8efeed126874a6 /src/Entities | |
| parent | Merge pull request #2645 from Gargaj/followedarray (diff) | |
| parent | Add enum for Sound and Particle Effects (diff) | |
| download | cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar.gz cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar.bz2 cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar.lz cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar.xz cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.tar.zst cuberite-412e5155a24339aa2a86f36e0ae5a9c5a0ff758d.zip | |
Diffstat (limited to 'src/Entities')
| -rw-r--r-- | src/Entities/ExpBottleEntity.cpp | 3 | ||||
| -rw-r--r-- | src/Entities/SplashPotionEntity.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/src/Entities/ExpBottleEntity.cpp b/src/Entities/ExpBottleEntity.cpp index ee142a5a2..b76df923a 100644 --- a/src/Entities/ExpBottleEntity.cpp +++ b/src/Entities/ExpBottleEntity.cpp @@ -2,6 +2,7 @@ #include "ExpBottleEntity.h" #include "../World.h" +#include "../EffectID.h" @@ -38,7 +39,7 @@ void cExpBottleEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_Hit void cExpBottleEntity::Break(const Vector3d &a_HitPos) { // Spawn an experience orb with a reward between 3 and 11. - m_World->BroadcastSoundParticleEffect(2002, POSX_TOINT, POSY_TOINT, POSZ_TOINT, 0); + m_World->BroadcastSoundParticleEffect(EffectID::PARTICLE_SPLASH_POTION, POSX_TOINT, POSY_TOINT, POSZ_TOINT, 0); m_World->SpawnExperienceOrb(GetPosX(), GetPosY(), GetPosZ(), 3 + m_World->GetTickRandomNumber(8)); Destroy(); } diff --git a/src/Entities/SplashPotionEntity.cpp b/src/Entities/SplashPotionEntity.cpp index 9d855dfa6..ba806e50e 100644 --- a/src/Entities/SplashPotionEntity.cpp +++ b/src/Entities/SplashPotionEntity.cpp @@ -3,6 +3,7 @@ #include "SplashPotionEntity.h" #include "Pawn.h" #include "../ClientHandle.h" +#include "../EffectID.h" @@ -121,7 +122,7 @@ void cSplashPotionEntity::Splash(const Vector3d & a_HitPos) m_World->ForEachEntity(Callback); m_World->BroadcastSoundParticleEffect( - 2002, + EffectID::PARTICLE_SPLASH_POTION, FloorC(a_HitPos.x), FloorC(a_HitPos.y), FloorC(a_HitPos.z), |