diff options
| author | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-07-29 18:45:36 +0200 |
|---|---|---|
| committer | Julian Laubstein <julianlaubstein@yahoo.de> | 2015-07-29 18:45:36 +0200 |
| commit | 735d590abf7f804a4504b70c84a289ba86c5f8e3 (patch) | |
| tree | 13b603c8bbf8177da92ce87f5413fb646d204f3f /src/BlockEntities | |
| parent | Merge pull request #2376 from mjhanninen/fix-freebsd-build (diff) | |
| parent | Silenced and fixed many warning messages across multiple files. (diff) | |
| download | cuberite-735d590abf7f804a4504b70c84a289ba86c5f8e3.tar cuberite-735d590abf7f804a4504b70c84a289ba86c5f8e3.tar.gz cuberite-735d590abf7f804a4504b70c84a289ba86c5f8e3.tar.bz2 cuberite-735d590abf7f804a4504b70c84a289ba86c5f8e3.tar.lz cuberite-735d590abf7f804a4504b70c84a289ba86c5f8e3.tar.xz cuberite-735d590abf7f804a4504b70c84a289ba86c5f8e3.tar.zst cuberite-735d590abf7f804a4504b70c84a289ba86c5f8e3.zip | |
Diffstat (limited to '')
| -rw-r--r-- | src/BlockEntities/BeaconEntity.cpp | 4 | ||||
| -rw-r--r-- | src/BlockEntities/NoteEntity.cpp | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/BlockEntities/BeaconEntity.cpp b/src/BlockEntities/BeaconEntity.cpp index a945c6ea9..a0de281ba 100644 --- a/src/BlockEntities/BeaconEntity.cpp +++ b/src/BlockEntities/BeaconEntity.cpp @@ -49,14 +49,14 @@ char cBeaconEntity::CalculatePyramidLevel(void) { if (!IsMineralBlock(Area.GetRelBlockType(X, Y, Z))) { - return (Layer - 1); + return static_cast<char>(Layer - 1); } } } Layer++; } - return (Layer - 1); + return static_cast<char>(Layer - 1); } diff --git a/src/BlockEntities/NoteEntity.cpp b/src/BlockEntities/NoteEntity.cpp index 29839bae1..53685233b 100644 --- a/src/BlockEntities/NoteEntity.cpp +++ b/src/BlockEntities/NoteEntity.cpp @@ -87,10 +87,10 @@ void cNoteEntity::MakeSound(void) } } - m_World->BroadcastBlockAction(m_PosX, m_PosY, m_PosZ, instrument, m_Pitch, E_BLOCK_NOTE_BLOCK); + m_World->BroadcastBlockAction(m_PosX, m_PosY, m_PosZ, static_cast<Byte>(instrument), static_cast<Byte>(m_Pitch), E_BLOCK_NOTE_BLOCK); // 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); + float calcPitch = static_cast<float>(pow(2.0f, static_cast<float>(m_Pitch - 12.0f) / 12.0f)); m_World->BroadcastSoundEffect( sampleName, static_cast<double>(m_PosX), |