flewkey/cuberite-2a
1
0
Fork 0
Code Releases Activity

Fixed a number of stylistic issues.

Browse Source
This commit is contained in:
Alexander Harkness 2014-10-16 19:08:22 +01:00
parent b5a2c6667a
commit 818c7948b7
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/BlockEntities/FurnaceEntity.cpp
View File

@ -5,7 +5,7 @@
#include "../UI/Window.h" #include "../UI/Window.h"
#include "../Entities/Player.h" #include "../Entities/Player.h"
#include "../Root.h" #include "../Root.h"
#include "Chunk.h" #include "../Chunk.h"
@ -27,12 +27,12 @@ cFurnaceEntity::cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTY
super(E_BLOCK_FURNACE, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World), super(E_BLOCK_FURNACE, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World),
m_BlockMeta(a_BlockMeta), m_BlockMeta(a_BlockMeta),
m_CurrentRecipe(NULL), m_CurrentRecipe(NULL),
m_IsDestroyed(false),
m_IsCooking((a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ) == E_BLOCK_LIT_FURNACE)), m_IsCooking((a_World->GetBlock(a_BlockX, a_BlockY, a_BlockZ) == E_BLOCK_LIT_FURNACE)),
m_NeedCookTime(0), m_NeedCookTime(0),
m_TimeCooked(0), m_TimeCooked(0),
m_FuelBurnTime(0), m_FuelBurnTime(0),
m_TimeBurned(0), m_TimeBurned(0)
m_IsDestroyed(false)
{ {
m_Contents.AddListener(*this); m_Contents.AddListener(*this);
} }
@ -221,8 +221,8 @@ void cFurnaceEntity::OnSlotChanged(cItemGrid * a_ItemGrid, int a_SlotNum)
ASSERT(a_ItemGrid == &m_Contents); ASSERT(a_ItemGrid == &m_Contents);
switch (a_SlotNum) switch (a_SlotNum)
{ {
case fsInput: UpdateInput(); break; case fsInput: UpdateInput(); break;
case fsFuel: UpdateFuel(); break; case fsFuel: UpdateFuel(); break;
case fsOutput: UpdateOutput(); break; case fsOutput: UpdateOutput(); break;
default: ASSERT(!"Invalid furnace slot update!"); break; default: ASSERT(!"Invalid furnace slot update!"); break;
} }
@ -347,11 +347,11 @@ void cFurnaceEntity::UpdateProgressBars(bool a_ForceUpdate)
} }
int CurFuel = (m_FuelBurnTime > 0) ? 200 - (200 * m_TimeBurned / m_FuelBurnTime) : 0; int CurFuel = (m_FuelBurnTime > 0) ? 200 - (200 * m_TimeBurned / m_FuelBurnTime) : 0;
BroadcastProgress(PROGRESSBAR_FUEL, (short)CurFuel); BroadcastProgress(PROGRESSBAR_FUEL, static_cast<short>(CurFuel));
int CurCook = (m_NeedCookTime > 0) ? (200 * m_TimeCooked / m_NeedCookTime) : 0; int CurCook = (m_NeedCookTime > 0) ? (200 * m_TimeCooked / m_NeedCookTime) : 0;
BroadcastProgress(PROGRESSBAR_SMELTING_CONFIRM, 200); // Post 1.8, Mojang requires a random packet with an ID of three and value of 200. Wat. Wat. Wat. BroadcastProgress(PROGRESSBAR_SMELTING_CONFIRM, 200); // Post 1.8, Mojang requires a random packet with an ID of three and value of 200. Wat. Wat. Wat.
BroadcastProgress(PROGRESSBAR_SMELTING, (short)CurCook); BroadcastProgress(PROGRESSBAR_SMELTING, static_cast<short>(CurCook));
} }