summaryrefslogtreecommitdiffstats
path: root/src/Entities/ArrowEntity.cpp
diff options
context:
space:
mode:
authorTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-09 20:56:50 +0200
committerTiger Wang <ziwei.tiger@hotmail.co.uk>2014-07-09 20:56:50 +0200
commit74b6b398e7e5a2384f398b7dceaf45716bc70b6f (patch)
treee8230be6a04a1c001e4855cad11626d3c1d16271 /src/Entities/ArrowEntity.cpp
parentMerge pull request #1135 from mc-server/fixes (diff)
downloadcuberite-74b6b398e7e5a2384f398b7dceaf45716bc70b6f.tar
cuberite-74b6b398e7e5a2384f398b7dceaf45716bc70b6f.tar.gz
cuberite-74b6b398e7e5a2384f398b7dceaf45716bc70b6f.tar.bz2
cuberite-74b6b398e7e5a2384f398b7dceaf45716bc70b6f.tar.lz
cuberite-74b6b398e7e5a2384f398b7dceaf45716bc70b6f.tar.xz
cuberite-74b6b398e7e5a2384f398b7dceaf45716bc70b6f.tar.zst
cuberite-74b6b398e7e5a2384f398b7dceaf45716bc70b6f.zip
Diffstat (limited to '')
-rw-r--r--src/Entities/ArrowEntity.cpp24
1 files changed, 3 insertions, 21 deletions
diff --git a/src/Entities/ArrowEntity.cpp b/src/Entities/ArrowEntity.cpp
index 47a0876fc..d59088e72 100644
--- a/src/Entities/ArrowEntity.cpp
+++ b/src/Entities/ArrowEntity.cpp
@@ -106,14 +106,7 @@ void cArrowEntity::OnHitEntity(cEntity & a_EntityHit, const Vector3d & a_HitPos)
a_EntityHit.TakeDamage(dtRangedAttack, this, Damage, 1);
// Broadcast successful hit sound
- m_World->BroadcastSoundEffect(
- "random.successful_hit",
- (int)std::floor(GetPosX() * 8.0),
- (int)std::floor(GetPosY() * 8.0),
- (int)std::floor(GetPosZ() * 8.0),
- 0.5f,
- 0.75f + ((float)((GetUniqueID() * 23) % 32)) / 64.0f
- );
+ GetWorld()->BroadcastSoundEffect("random.successful_hit", (int)GetPosX() * 8, (int)GetPosY() * 8, (int)GetPosZ() * 8, 0.5, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64));
Destroy();
}
@@ -136,21 +129,10 @@ void cArrowEntity::CollectedBy(cPlayer * a_Dest)
return;
}
}
-
- // TODO: BroadcastCollectPickup needs a cPickup, which we don't have
- // m_World->BroadcastCollectPickup(*this, *a_Dest);
+ GetWorld()->BroadcastCollectEntity(*this, *a_Dest);
+ GetWorld()->BroadcastSoundEffect("random.pop", (int)GetPosX() * 8, (int)GetPosY() * 8, (int)GetPosZ() * 8, 0.5, (float)(0.75 + ((float)((GetUniqueID() * 23) % 32)) / 64));
m_bIsCollected = true;
-
- cFastRandom Random;
- m_World->BroadcastSoundEffect(
- "random.pop",
- (int)std::floor(GetPosX() * 8.0),
- (int)std::floor(GetPosY() * 8),
- (int)std::floor(GetPosZ() * 8),
- 0.2F,
- ((Random.NextFloat(1.0F) - Random.NextFloat(1.0F)) * 0.7F + 1.0F) * 2.0F
- );
}
}