diff options
| author | tycho <work.tycho@gmail.com> | 2015-05-28 13:29:26 +0200 |
|---|---|---|
| committer | tycho <work.tycho@gmail.com> | 2015-05-28 13:54:04 +0200 |
| commit | b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0 (patch) | |
| tree | ff9846d0ffa558e237ea148762f67b5ebf71a47d /src/BlockEntities | |
| parent | Merge branch 'master' into PreventNewWarnings (diff) | |
| download | cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar.gz cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar.bz2 cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar.lz cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar.xz cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.tar.zst cuberite-b2fa71a32ac8bd86bda778a5d54fe2e7e471a1c0.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/BlockEntities/MobSpawnerEntity.cpp | 3 | ||||
| -rw-r--r-- | src/BlockEntities/NoteEntity.cpp | 12 |
2 files changed, 9 insertions, 6 deletions
diff --git a/src/BlockEntities/MobSpawnerEntity.cpp b/src/BlockEntities/MobSpawnerEntity.cpp index 4746bdd1b..1a0ce5b22 100644 --- a/src/BlockEntities/MobSpawnerEntity.cpp +++ b/src/BlockEntities/MobSpawnerEntity.cpp @@ -177,7 +177,8 @@ void cMobSpawnerEntity::SpawnEntity(void) static_cast<int>(PosX * 8.0), static_cast<int>(RelY * 8.0), static_cast<int>(PosZ * 8.0), - 0); + 0 + ); m_NearbyEntitiesNum++; } } diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp index 48ca15d1f..29839bae1 100644 --- a/src/BlockEntities/NoteEntity.cpp +++ b/src/BlockEntities/NoteEntity.cpp @@ -92,11 +92,13 @@ void cNoteEntity::MakeSound(void) // TODO: instead of calculating the power function over and over, make a precalculated table - there's only 24 pitches after all float calcPitch = pow(2.0f, static_cast<float>(m_Pitch - 12.0f) / 12.0f); m_World->BroadcastSoundEffect( - sampleName, - static_cast<double>(m_PosX), - static_cast<double>(m_PosY), - static_cast<double>(m_PosZ), - 3.0f, calcPitch); + sampleName, + static_cast<double>(m_PosX), + static_cast<double>(m_PosY), + static_cast<double>(m_PosZ), + 3.0f, + calcPitch + ); } |