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:
@@ -27,7 +27,7 @@ AABB *TopSnowTile::getAABB(Level *level, int x, int y, int z)
|
||||
{
|
||||
int height = level->getData(x, y, z) & HEIGHT_MASK;
|
||||
float offset = 2.0f / SharedConstants::WORLD_RESOLUTION;
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
return AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, y + (height * offset), z + tls->zz1);
|
||||
}
|
||||
|
||||
@@ -100,7 +100,7 @@ void TopSnowTile::playerDestroy(Level *level, shared_ptr<Player> player, int x,
|
||||
{
|
||||
int type = Item::snowBall->id;
|
||||
int height = data & HEIGHT_MASK;
|
||||
popResource(level, x, y, z, shared_ptr<ItemInstance>( new ItemInstance(type, height + 1, 0)));
|
||||
popResource(level, x, y, z, std::make_shared<ItemInstance>(type, height + 1, 0));
|
||||
level->removeTile(x, y, z);
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user