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:
@@ -67,7 +67,7 @@ bool RandomScatteredLargeFeature::isFeatureChunk(int x, int z, bool bIsSuperflat
|
||||
|
||||
bool forcePlacement = false;
|
||||
LevelGenerationOptions *levelGenOptions = app.getLevelGenerationOptions();
|
||||
if( levelGenOptions != NULL )
|
||||
if( levelGenOptions != nullptr )
|
||||
{
|
||||
forcePlacement = levelGenOptions->isFeatureChunk(x,z,eFeature_Temples);
|
||||
}
|
||||
@@ -123,14 +123,14 @@ RandomScatteredLargeFeature::ScatteredFeatureStart::ScatteredFeatureStart(Level
|
||||
bool RandomScatteredLargeFeature::isSwamphut(int cellX, int cellY, int cellZ)
|
||||
{
|
||||
StructureStart *structureAt = getStructureAt(cellX, cellY, cellZ);
|
||||
if (structureAt == NULL || !( dynamic_cast<ScatteredFeatureStart *>( structureAt ) ) || structureAt->pieces.empty())
|
||||
if (structureAt == nullptr || !( dynamic_cast<ScatteredFeatureStart *>( structureAt ) ) || structureAt->pieces.empty())
|
||||
{
|
||||
return false;
|
||||
}
|
||||
StructurePiece *first = NULL;
|
||||
StructurePiece *first = nullptr;
|
||||
auto it = structureAt->pieces.begin();
|
||||
if(it != structureAt->pieces.end() ) first = *it;
|
||||
return dynamic_cast<ScatteredFeaturePieces::SwamplandHut *>(first) != NULL;
|
||||
return dynamic_cast<ScatteredFeaturePieces::SwamplandHut *>(first) != nullptr;
|
||||
}
|
||||
|
||||
vector<Biome::MobSpawnerData *> *RandomScatteredLargeFeature::getSwamphutEnemies()
|
||||
|
||||
Reference in New Issue
Block a user