diff options
| author | Tiger Wang <ziwei.tiger@hotmail.co.uk> | 2014-10-20 22:55:07 +0200 |
|---|---|---|
| committer | archshift <admin@archshift.com> | 2014-10-23 05:12:49 +0200 |
| commit | a26541a7c3ced0569098edd0aae61c097c2912f4 (patch) | |
| tree | 4b7bea204c0ddd18bb4f95357f9eb77590bc2e8d /src/BlockEntities/FurnaceEntity.cpp | |
| parent | ComposableGenerator: Removed nullptr initializers. (diff) | |
| download | cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar.gz cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar.bz2 cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar.lz cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar.xz cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.tar.zst cuberite-a26541a7c3ced0569098edd0aae61c097c2912f4.zip | |
Diffstat (limited to 'src/BlockEntities/FurnaceEntity.cpp')
| -rw-r--r-- | src/BlockEntities/FurnaceEntity.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/BlockEntities/FurnaceEntity.cpp b/src/BlockEntities/FurnaceEntity.cpp index ac71f1541..d2ec2bd1e 100644 --- a/src/BlockEntities/FurnaceEntity.cpp +++ b/src/BlockEntities/FurnaceEntity.cpp @@ -26,7 +26,7 @@ enum cFurnaceEntity::cFurnaceEntity(int a_BlockX, int a_BlockY, int a_BlockZ, BLOCKTYPE a_BlockType, NIBBLETYPE a_BlockMeta, cWorld * a_World) : super(a_BlockType, a_BlockX, a_BlockY, a_BlockZ, ContentsWidth, ContentsHeight, a_World), m_BlockMeta(a_BlockMeta), - m_CurrentRecipe(NULL), + m_CurrentRecipe(nullptr), m_IsDestroyed(false), m_IsCooking(a_BlockType == E_BLOCK_LIT_FURNACE), m_NeedCookTime(0), @@ -45,7 +45,7 @@ cFurnaceEntity::~cFurnaceEntity() { // Tell window its owner is destroyed cWindow * Window = GetWindow(); - if (Window != NULL) + if (Window != nullptr) { Window->OwnerDestroyed(); } @@ -145,7 +145,7 @@ void cFurnaceEntity::SendTo(cClientHandle & a_Client) void cFurnaceEntity::BroadcastProgress(short a_ProgressbarID, short a_Value) { cWindow * Window = GetWindow(); - if (Window != NULL) + if (Window != nullptr) { Window->SetProperty(a_ProgressbarID, a_Value); } @@ -306,7 +306,7 @@ void cFurnaceEntity::UpdateOutput(void) bool cFurnaceEntity::CanCookInputToOutput(void) const { - if (m_CurrentRecipe == NULL) + if (m_CurrentRecipe == nullptr) { // This input cannot be cooked return false; |