Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -35,7 +35,7 @@ ScatteredFeaturePieces::ScatteredFeaturePiece::ScatteredFeaturePiece(Random *ran
|
||||
orientation = random->nextInt(4);
|
||||
|
||||
LevelGenerationOptions *levelGenOptions = app.getLevelGenerationOptions();
|
||||
if( levelGenOptions != nullptr )
|
||||
if( levelGenOptions != NULL )
|
||||
{
|
||||
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 = std::make_shared<Witch>(level);
|
||||
shared_ptr<Witch> witch = shared_ptr<Witch>( new Witch(level) );
|
||||
witch->moveTo(wx + .5, wy, wz + .5, 0, 0);
|
||||
witch->finalizeMobSpawn(nullptr);
|
||||
witch->finalizeMobSpawn(NULL);
|
||||
level->addEntity(witch);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user