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 @@ SkullTileEntity::SkullTileEntity()
|
||||
void SkullTileEntity::save(CompoundTag *tag)
|
||||
{
|
||||
TileEntity::save(tag);
|
||||
tag->putByte(L"SkullType", (BYTE) (skullType & 0xff));
|
||||
tag->putByte(L"Rot", (BYTE) (rotation & 0xff));
|
||||
tag->putByte(L"SkullType", static_cast<BYTE>(skullType & 0xff));
|
||||
tag->putByte(L"Rot", static_cast<BYTE>(rotation & 0xff));
|
||||
tag->putString(L"ExtraType", extraType);
|
||||
}
|
||||
|
||||
@@ -30,7 +30,7 @@ shared_ptr<Packet> SkullTileEntity::getUpdatePacket()
|
||||
{
|
||||
CompoundTag *tag = new CompoundTag();
|
||||
save(tag);
|
||||
return shared_ptr<TileEntityDataPacket>(new TileEntityDataPacket(x, y, z, TileEntityDataPacket::TYPE_SKULL, tag));
|
||||
return std::make_shared<TileEntityDataPacket>(x, y, z, TileEntityDataPacket::TYPE_SKULL, tag);
|
||||
}
|
||||
|
||||
void SkullTileEntity::setSkullType(int skullType, const wstring &extra)
|
||||
@@ -62,7 +62,7 @@ wstring SkullTileEntity::getExtraType()
|
||||
// 4J Added
|
||||
shared_ptr<TileEntity> SkullTileEntity::clone()
|
||||
{
|
||||
shared_ptr<SkullTileEntity> result = shared_ptr<SkullTileEntity>( new SkullTileEntity() );
|
||||
shared_ptr<SkullTileEntity> result = std::make_shared<SkullTileEntity>();
|
||||
TileEntity::clone(result);
|
||||
|
||||
result->skullType = skullType;
|
||||
|
||||
Reference in New Issue
Block a user