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:
@@ -35,8 +35,8 @@ bool OreFeature::place(Level *level, Random *random, int x, int y, int z)
|
||||
|
||||
bool collisionsExpected = false;
|
||||
|
||||
LevelGenerationOptions *levelGenOptions = NULL;
|
||||
if( app.getLevelGenerationOptions() != NULL )
|
||||
LevelGenerationOptions *levelGenOptions = nullptr;
|
||||
if( app.getLevelGenerationOptions() != nullptr )
|
||||
{
|
||||
levelGenOptions = app.getLevelGenerationOptions();
|
||||
|
||||
@@ -83,7 +83,7 @@ bool OreFeature::place(Level *level, Random *random, int x, int y, int z)
|
||||
int zt1 = Mth::floor(zz + halfR);
|
||||
|
||||
// 4J Stu Added to stop ore features generating areas previously place by game rule generation
|
||||
if(collisionsExpected && levelGenOptions != NULL)
|
||||
if(collisionsExpected && levelGenOptions != nullptr)
|
||||
{
|
||||
bool intersects = levelGenOptions->checkIntersects(xt0, yt0, zt0, xt1, yt1, zt1);
|
||||
if(intersects)
|
||||
|
||||
Reference in New Issue
Block a user