Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Project modernization (#630)

Browse Source 
* Fixed boats falling and a TP glitch #266

* Replaced every C-style cast with C++ ones

* Replaced every C-style cast with C++ ones

* Fixed boats falling and a TP glitch #266

* Updated NULL to nullptr and fixing some type issues

* Modernized and fixed a few bugs

- Replaced most instances of `NULL` with `nullptr`.
- Replaced most `shared_ptr(new ...)` with `make_shared`.
- Removed the `nullptr` macro as it was interfering with the actual nullptr keyword in some instances.

* Fixing more conflicts

* Replace int loops with size_t and start work on overrides
This commit is contained in:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.World/Sapling.cpp
View File

@@ -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;
}