diff options
author | Howaner <franzi.moos@googlemail.com> | 2014-10-21 21:16:04 +0200 |
---|---|---|
committer | Howaner <franzi.moos@googlemail.com> | 2014-10-21 21:16:04 +0200 |
commit | 6f99615cebba82edcad3d6b3981915285bbefc90 (patch) | |
tree | a8213436004b417555927f8f094198305a46af40 /src/BlockEntities/DispenserEntity.cpp | |
parent | style. (diff) | |
parent | Merged branch 'master' of git://github.com/sriehl/MCServer (diff) | |
download | cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.gz cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.bz2 cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.lz cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.xz cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.tar.zst cuberite-6f99615cebba82edcad3d6b3981915285bbefc90.zip |
Diffstat (limited to 'src/BlockEntities/DispenserEntity.cpp')
-rw-r--r-- | src/BlockEntities/DispenserEntity.cpp | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/src/BlockEntities/DispenserEntity.cpp b/src/BlockEntities/DispenserEntity.cpp index aea854dc2..157862bd1 100644 --- a/src/BlockEntities/DispenserEntity.cpp +++ b/src/BlockEntities/DispenserEntity.cpp @@ -105,7 +105,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) { double MobX = 0.5 + (DispX + DispChunk->GetPosX() * cChunkDef::Width); double MobZ = 0.5 + (DispZ + DispChunk->GetPosZ() * cChunkDef::Width); - if (m_World->SpawnMob(MobX, DispY, MobZ, (eMonsterType)m_Contents.GetSlot(a_SlotNum).m_ItemDamage) >= 0) + if (m_World->SpawnMob(MobX, DispY, MobZ, static_cast<eMonsterType>(m_Contents.GetSlot(a_SlotNum).m_ItemDamage)) >= 0) { m_Contents.ChangeSlotCount(a_SlotNum, -1); } @@ -190,7 +190,7 @@ void cDispenserEntity::DropSpenseFromSlot(cChunk & a_Chunk, int a_SlotNum) void cDispenserEntity::SpawnProjectileFromDispenser(int a_BlockX, int a_BlockY, int a_BlockZ, cProjectileEntity::eKind a_Kind, const Vector3d & a_ShootVector) { - m_World->CreateProjectile((double)a_BlockX + 0.5, (double)a_BlockY + 0.5, (double)a_BlockZ + 0.5, a_Kind, NULL, NULL, &a_ShootVector); + m_World->CreateProjectile(static_cast<double>(a_BlockX + 0.5), static_cast<double>(a_BlockY + 0.5), static_cast<double>(a_BlockZ + 0.5), a_Kind, NULL, NULL, &a_ShootVector); } @@ -275,6 +275,3 @@ bool cDispenserEntity::EmptyLiquidBucket(BLOCKTYPE a_BlockInFront, int a_SlotNum m_Contents.AddItem(EmptyBucket); return true; } - - - |