Karutoh/MinecraftConsoles
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Project modernization (#630)"

Browse Source 
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:
Loki Rautio
2026-03-07 21:12:22 -06:00
parent a9be52c41a
commit 087b7e7abf
1373 changed files with 19449 additions and 19903 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
Minecraft.World/ArmorSlot.cpp
View File

@@ -19,11 +19,11 @@ int ArmorSlot::getMaxStackSize() const
bool ArmorSlot::mayPlace(shared_ptr<ItemInstance> item)
{
if (item == nullptr)
if (item == NULL)
{
return false;
}
if ( dynamic_cast<ArmorItem *>( item->getItem() ) != nullptr)
if ( dynamic_cast<ArmorItem *>( item->getItem() ) != NULL)
{
return dynamic_cast<ArmorItem *>( item->getItem() )->slot == slotNum;
}
@@ -43,7 +43,7 @@ Icon *ArmorSlot::getNoItemIcon()
//bool ArmorSlot::mayCombine(shared_ptr<ItemInstance> item)
//{
// shared_ptr<ItemInstance> thisItemI = getItem();
// if(thisItemI == nullptr || item == nullptr) return false;
// if(thisItemI == NULL || item == NULL) return false;
//
// ArmorItem *thisItem = (ArmorItem *)thisItemI->getItem();
// bool thisIsDyableArmor = thisItem->getMaterial() == ArmorItem::ArmorMaterial::CLOTH;
@@ -53,7 +53,7 @@ Icon *ArmorSlot::getNoItemIcon()
//
//shared_ptr<ItemInstance> ArmorSlot::combine(shared_ptr<ItemInstance> item)
//{
// shared_ptr<CraftingContainer> craftSlots = shared_ptr<CraftingContainer>( new CraftingContainer(nullptr, 2, 2) );
// shared_ptr<CraftingContainer> craftSlots = shared_ptr<CraftingContainer>( new CraftingContainer(NULL, 2, 2) );
// craftSlots->setItem(0, item);
// craftSlots->setItem(1, getItem()); // Armour item needs to go second
// shared_ptr<ItemInstance> result = ArmorDyeRecipe::assembleDyedArmor(craftSlots);