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:
@@ -9,7 +9,7 @@ CropTile::CropTile(int id) : Bush(id)
|
||||
{
|
||||
setTicking(true);
|
||||
updateDefaultShape();
|
||||
icons = NULL;
|
||||
icons = nullptr;
|
||||
|
||||
setDestroyTime(0.0f);
|
||||
setSoundType(SOUND_GRASS);
|
||||
@@ -40,7 +40,7 @@ void CropTile::tick(Level *level, int x, int y, int z, Random *random)
|
||||
{
|
||||
float growthSpeed = getGrowthSpeed(level, x, y, z);
|
||||
|
||||
if (random->nextInt((int) (25 / growthSpeed) + 1) == 0)
|
||||
if (random->nextInt(static_cast<int>(25 / growthSpeed) + 1) == 0)
|
||||
{
|
||||
age++;
|
||||
level->setData(x, y, z, age, Tile::UPDATE_CLIENTS);
|
||||
@@ -136,7 +136,7 @@ void CropTile::spawnResources(Level *level, int x, int y, int z, int data, float
|
||||
for (int i = 0; i < count; i++)
|
||||
{
|
||||
if (level->random->nextInt(5 * 3) > data) continue;
|
||||
popResource(level, x, y, z, shared_ptr<ItemInstance>(new ItemInstance(getBaseSeedId(), 1, 0)));
|
||||
popResource(level, x, y, z, std::make_shared<ItemInstance>(getBaseSeedId(), 1, 0));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user