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:
@@ -82,7 +82,7 @@ bool VillageFeature::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_Village);
|
||||
}
|
||||
@@ -134,7 +134,7 @@ VillageFeature::VillageStart::VillageStart(Level *level, Random *random, int chu
|
||||
// prioritize roads
|
||||
if (pendingRoads->empty())
|
||||
{
|
||||
int pos = random->nextInt((int)pendingHouses->size());
|
||||
int pos = random->nextInt(static_cast<int>(pendingHouses->size()));
|
||||
auto it = pendingHouses->begin() + pos;
|
||||
StructurePiece *structurePiece = *it;
|
||||
pendingHouses->erase(it);
|
||||
@@ -142,7 +142,7 @@ VillageFeature::VillageStart::VillageStart(Level *level, Random *random, int chu
|
||||
}
|
||||
else
|
||||
{
|
||||
int pos = random->nextInt((int)pendingRoads->size());
|
||||
int pos = random->nextInt(static_cast<int>(pendingRoads->size()));
|
||||
auto it = pendingRoads->begin() + pos;
|
||||
StructurePiece *structurePiece = *it;
|
||||
pendingRoads->erase(it);
|
||||
|
||||
Reference in New Issue
Block a user