Project modernization (#630)

* 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

View File

@@ -9,8 +9,8 @@ BiomeDecorator::BiomeDecorator(Biome *biome)
_init();
// 4J inits
level = NULL;
random = NULL;
level = nullptr;
random = nullptr;
xo = 0;
zo = 0;
@@ -19,7 +19,7 @@ BiomeDecorator::BiomeDecorator(Biome *biome)
void BiomeDecorator::decorate(Level *level, Random *random, int xo, int zo)
{
if (this->level != NULL)
if (this->level != nullptr)
{
app.DebugPrintf("BiomeDecorator::decorate - Already decorating!!\n");
#ifndef _CONTENT_PACKAGE
@@ -34,8 +34,8 @@ void BiomeDecorator::decorate(Level *level, Random *random, int xo, int zo)
decorate();
this->level = NULL;
this->random = NULL;
this->level = nullptr;
this->random = nullptr;
}
@@ -164,7 +164,7 @@ void BiomeDecorator::decorate()
// 4J Stu - For some reason this was created each time round in the loop
// I assume there is a case where deadBushCount could be 0
DeadBushFeature *deadBushFeature = NULL;
DeadBushFeature *deadBushFeature = nullptr;
if(deadBushCount > 0) deadBushFeature = new DeadBushFeature(Tile::deadBush_Id);
for (int i = 0; i < deadBushCount; i++)
{
@@ -174,7 +174,7 @@ void BiomeDecorator::decorate()
//new DeadBushFeature(Tile::deadBush_Id)->place(level, random, x, y, z);
deadBushFeature->place(level, random, x, y, z);
}
if(deadBushFeature != NULL)delete deadBushFeature;
if(deadBushFeature != nullptr)delete deadBushFeature;
for (int i = 0; i < waterlilyCount; i++)
{