Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore
functionality of the nightly. All in-game menus do not work and generating
a world crashes.
This reverts commit a9be52c41a.
This commit is contained in:
@@ -21,9 +21,9 @@ int FireworksChargeItem::getColor(shared_ptr<ItemInstance> item, int spriteLayer
|
||||
if (spriteLayer == 1)
|
||||
{
|
||||
Tag *colorTag = getExplosionTagField(item, FireworksItem::TAG_E_COLORS);
|
||||
if (colorTag != nullptr)
|
||||
if (colorTag != NULL)
|
||||
{
|
||||
IntArrayTag *colors = static_cast<IntArrayTag *>(colorTag);
|
||||
IntArrayTag *colors = (IntArrayTag *) colorTag;
|
||||
if (colors->data.length == 1)
|
||||
{
|
||||
return colors->data[0];
|
||||
@@ -58,12 +58,12 @@ Tag *FireworksChargeItem::getExplosionTagField(shared_ptr<ItemInstance> instance
|
||||
if (instance->hasTag())
|
||||
{
|
||||
CompoundTag *explosion = instance->getTag()->getCompound(FireworksItem::TAG_EXPLOSION);
|
||||
if (explosion != nullptr)
|
||||
if (explosion != NULL)
|
||||
{
|
||||
return explosion->get(field);
|
||||
}
|
||||
}
|
||||
return nullptr;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
void FireworksChargeItem::appendHoverText(shared_ptr<ItemInstance> itemInstance, shared_ptr<Player> player, vector<HtmlString> *lines, bool advanced)
|
||||
@@ -71,7 +71,7 @@ void FireworksChargeItem::appendHoverText(shared_ptr<ItemInstance> itemInstance,
|
||||
if (itemInstance->hasTag())
|
||||
{
|
||||
CompoundTag *explosion = itemInstance->getTag()->getCompound(FireworksItem::TAG_EXPLOSION);
|
||||
if (explosion != nullptr)
|
||||
if (explosion != NULL)
|
||||
{
|
||||
appendHoverText(explosion, lines);
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user