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/BlockEntityWithItems.h | |
| 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/BlockEntityWithItems.h')
| -rw-r--r-- | src/BlockEntities/BlockEntityWithItems.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/BlockEntities/BlockEntityWithItems.h b/src/BlockEntities/BlockEntityWithItems.h index cb7bc2fb4..8c7d4749b 100644 --- a/src/BlockEntities/BlockEntityWithItems.h +++ b/src/BlockEntities/BlockEntityWithItems.h @@ -47,7 +47,7 @@ public: virtual void Destroy(void) override { // Drop the contents as pickups: - ASSERT(m_World != NULL); + ASSERT(m_World != nullptr); cItems Pickups; m_Contents.CopyToItems(Pickups); m_Contents.Clear(); @@ -78,9 +78,9 @@ protected: { UNUSED(a_SlotNum); ASSERT(a_Grid == &m_Contents); - if (m_World != NULL) + if (m_World != nullptr) { - if (GetWindow() != NULL) + if (GetWindow() != nullptr) { GetWindow()->BroadcastWholeWindow(); } |