diff options
Diffstat (limited to 'Minecraft.World/Sapling.cpp')
| -rw-r--r-- | Minecraft.World/Sapling.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Minecraft.World/Sapling.cpp b/Minecraft.World/Sapling.cpp index 85fcea98..c169a608 100644 --- a/Minecraft.World/Sapling.cpp +++ b/Minecraft.World/Sapling.cpp @@ -17,7 +17,7 @@ const wstring Sapling::TEXTURE_NAMES[] = {L"sapling", L"sapling_spruce", L"sapli Sapling::Sapling(int id) : Bush( id ) { this->updateDefaultShape(); - icons = NULL; + icons = nullptr; } // 4J Added override @@ -65,7 +65,7 @@ void Sapling::growTree(Level *level, int x, int y, int z, Random *random) { int data = level->getData(x, y, z) & TYPE_MASK; - Feature *f = NULL; + Feature *f = nullptr; int ox = 0, oz = 0; bool multiblock = false; @@ -93,12 +93,12 @@ void Sapling::growTree(Level *level, int x, int y, int z, Random *random) break; } } - if (f != NULL) + if (f != nullptr) { break; } } - if (f == NULL) + if (f == nullptr) { ox = oz = 0; f = new TreeFeature(true, 4 + random->nextInt(7), TreeTile::JUNGLE_TRUNK, LeafTile::JUNGLE_LEAF, false); @@ -138,7 +138,7 @@ void Sapling::growTree(Level *level, int x, int y, int z, Random *random) level->setTileAndData(x, y, z, id, data, Tile::UPDATE_NONE); } } - if( f != NULL ) + if( f != nullptr ) delete f; } |