diff options
| author | madmaxoft <github@xoft.cz> | 2014-01-06 22:22:33 +0100 |
|---|---|---|
| committer | madmaxoft <github@xoft.cz> | 2014-01-06 22:22:33 +0100 |
| commit | 9c8af58b7546448e9168ca6d70b5ba9a7f4330d7 (patch) | |
| tree | 6c387a2d177f6ee3a22038ba760f6a4e4390332b /src/BlockEntities | |
| parent | Merge pull request #511 from mc-server/CmakeOutput (diff) | |
| download | cuberite-9c8af58b7546448e9168ca6d70b5ba9a7f4330d7.tar cuberite-9c8af58b7546448e9168ca6d70b5ba9a7f4330d7.tar.gz cuberite-9c8af58b7546448e9168ca6d70b5ba9a7f4330d7.tar.bz2 cuberite-9c8af58b7546448e9168ca6d70b5ba9a7f4330d7.tar.lz cuberite-9c8af58b7546448e9168ca6d70b5ba9a7f4330d7.tar.xz cuberite-9c8af58b7546448e9168ca6d70b5ba9a7f4330d7.tar.zst cuberite-9c8af58b7546448e9168ca6d70b5ba9a7f4330d7.zip | |
Diffstat (limited to 'src/BlockEntities')
| -rw-r--r-- | src/BlockEntities/FurnaceEntity.cpp | 8 | ||||
| -rw-r--r-- | src/BlockEntities/HopperEntity.cpp | 1 |
2 files changed, 4 insertions, 5 deletions
diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp index b1409f5cc..f15553968 100644 --- a/src/BlockEntities/FurnaceEntity.cpp +++ b/src/BlockEntities/FurnaceEntity.cpp @@ -70,8 +70,8 @@ void cFurnaceEntity::UsedBy(cPlayer * a_Player) if (a_Player->GetWindow() != Window) { a_Player->OpenWindow(Window); - BroadcastProgress(PROGRESSBAR_FUEL, m_LastProgressFuel); - BroadcastProgress(PROGRESSBAR_SMELTING, m_LastProgressCook); + BroadcastProgress(PROGRESSBAR_FUEL, (short)m_LastProgressFuel); + BroadcastProgress(PROGRESSBAR_SMELTING, (short)m_LastProgressCook); } } } @@ -445,14 +445,14 @@ void cFurnaceEntity::UpdateProgressBars(void) int CurFuel = (m_FuelBurnTime > 0) ? (200 - 200 * m_TimeBurned / m_FuelBurnTime) : 0; if ((CurFuel / 8) != (m_LastProgressFuel / 8)) { - BroadcastProgress(PROGRESSBAR_FUEL, CurFuel); + BroadcastProgress(PROGRESSBAR_FUEL, (short)CurFuel); m_LastProgressFuel = CurFuel; } int CurCook = (m_NeedCookTime > 0) ? (200 * m_TimeCooked / m_NeedCookTime) : 0; if ((CurCook / 8) != (m_LastProgressCook / 8)) { - BroadcastProgress(PROGRESSBAR_SMELTING, CurCook); + BroadcastProgress(PROGRESSBAR_SMELTING, (short)CurCook); m_LastProgressCook = CurCook; } } diff --git a/src/BlockEntities/HopperEntity.cpp b/src/BlockEntities/HopperEntity.cpp index 0aca3209f..eac59e74d 100644 --- a/src/BlockEntities/HopperEntity.cpp +++ b/src/BlockEntities/HopperEntity.cpp @@ -488,7 +488,6 @@ bool cHopperEntity::MoveItemsToFurnace(cChunk & a_Chunk, int a_BlockX, int a_Blo // Feed the fuel slot of the furnace return MoveItemsToSlot(*Furnace, cFurnaceEntity::fsFuel); } - return false; } |