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,7 +35,7 @@ ScatteredFeaturePieces::ScatteredFeaturePiece::ScatteredFeaturePiece(Random *ran
|
||||
orientation = random->nextInt(4);
|
||||
|
||||
LevelGenerationOptions *levelGenOptions = app.getLevelGenerationOptions();
|
||||
if( levelGenOptions != NULL )
|
||||
if( levelGenOptions != nullptr )
|
||||
{
|
||||
int tempOrientation = 0;
|
||||
if(levelGenOptions->isFeatureChunk(west>>4,north>>4,StructureFeature::eFeature_Temples, &tempOrientation) )
|
||||
@@ -737,9 +737,9 @@ bool ScatteredFeaturePieces::SwamplandHut::postProcess(Level *level, Random *ran
|
||||
{
|
||||
spawnedWitch = true;
|
||||
|
||||
shared_ptr<Witch> witch = shared_ptr<Witch>( new Witch(level) );
|
||||
shared_ptr<Witch> witch = std::make_shared<Witch>(level);
|
||||
witch->moveTo(wx + .5, wy, wz + .5, 0, 0);
|
||||
witch->finalizeMobSpawn(NULL);
|
||||
witch->finalizeMobSpawn(nullptr);
|
||||
level->addEntity(witch);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user