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:
@@ -15,13 +15,13 @@ NetherBridgeFeature::NetherBridgeFeature() : StructureFeature()
|
||||
bridgeEnemies.push_back(new Biome::MobSpawnerData(eTYPE_SKELETON, 10, 4, 4));
|
||||
bridgeEnemies.push_back(new Biome::MobSpawnerData(eTYPE_LAVASLIME, 3, 4, 4));
|
||||
isSpotSelected=false;
|
||||
netherFortressPos = NULL;
|
||||
netherFortressPos = nullptr;
|
||||
|
||||
}
|
||||
|
||||
NetherBridgeFeature::~NetherBridgeFeature()
|
||||
{
|
||||
if( netherFortressPos != NULL ) delete netherFortressPos;
|
||||
if( netherFortressPos != nullptr ) delete netherFortressPos;
|
||||
}
|
||||
|
||||
wstring NetherBridgeFeature::getFeatureName()
|
||||
@@ -57,7 +57,7 @@ bool NetherBridgeFeature::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_NetherBridge);
|
||||
}
|
||||
@@ -118,7 +118,7 @@ NetherBridgeFeature::NetherBridgeStart::NetherBridgeStart(Level *level, Random *
|
||||
vector<StructurePiece *> *pendingChildren = &start->pendingChildren;
|
||||
while (!pendingChildren->empty())
|
||||
{
|
||||
int pos = random->nextInt((int)pendingChildren->size());
|
||||
int pos = random->nextInt(static_cast<int>(pendingChildren->size()));
|
||||
auto it = pendingChildren->begin() + pos;
|
||||
StructurePiece *structurePiece = *it;
|
||||
pendingChildren->erase(it);
|
||||
|
||||
Reference in New Issue
Block a user