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:
@@ -13,8 +13,8 @@ const wstring PumpkinTile::TEXTURE_LANTERN = L"pumpkin_jack";
|
||||
|
||||
PumpkinTile::PumpkinTile(int id, bool lit) : DirectionalTile(id, Material::vegetable, isSolidRender() )
|
||||
{
|
||||
iconTop = NULL;
|
||||
iconFace = NULL;
|
||||
iconTop = nullptr;
|
||||
iconFace = nullptr;
|
||||
setTicking(true);
|
||||
this->lit = lit;
|
||||
}
|
||||
@@ -45,7 +45,7 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z)
|
||||
level->setTileAndData(x, y, z, 0, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x, y - 1, z, 0, 0, Tile::UPDATE_CLIENTS);
|
||||
level->setTileAndData(x, y - 2, z, 0, 0, Tile::UPDATE_CLIENTS);
|
||||
shared_ptr<SnowMan> snowMan = shared_ptr<SnowMan>(new SnowMan(level));
|
||||
shared_ptr<SnowMan> snowMan = std::make_shared<SnowMan>(level);
|
||||
snowMan->moveTo(x + 0.5, y - 1.95, z + 0.5, 0, 0);
|
||||
level->addEntity(snowMan);
|
||||
|
||||
@@ -94,7 +94,7 @@ void PumpkinTile::onPlace(Level *level, int x, int y, int z)
|
||||
level->setTileAndData(x, y - 1, z + 1, 0, 0, Tile::UPDATE_CLIENTS);
|
||||
}
|
||||
|
||||
shared_ptr<VillagerGolem> villagerGolem = shared_ptr<VillagerGolem>(new VillagerGolem(level));
|
||||
shared_ptr<VillagerGolem> villagerGolem = std::make_shared<VillagerGolem>(level);
|
||||
villagerGolem->setPlayerCreated(true);
|
||||
villagerGolem->moveTo(x + 0.5, y - 1.95, z + 0.5, 0, 0);
|
||||
level->addEntity(villagerGolem);
|
||||
|
||||
Reference in New Issue
Block a user