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

Project modernization (#630)

Browse Source 
* 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:
ModMaker101
2026-03-07 21:56:03 -05:00
committed by GitHub
parent 1be5faaea7
commit a9be52c41a
1373 changed files with 19903 additions and 19449 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Minecraft.World/MerchantContainer.cpp
View File

@@ -11,7 +11,7 @@ MerchantContainer::MerchantContainer(shared_ptr<Player> player, shared_ptr<Merch
items[0] = nullptr;
items[1] = nullptr;
items[2] = nullptr;
activeRecipe = NULL;
activeRecipe = nullptr;
selectionHint = 0;
}
@@ -32,7 +32,7 @@ shared_ptr<ItemInstance> MerchantContainer::getItem(unsigned int slot)
shared_ptr<ItemInstance> MerchantContainer::removeItem(unsigned int slot, int count)
{
if (items[slot] != NULL)
if (items[slot] != nullptr)
{
if (slot == MerchantMenu::RESULT_SLOT)
{
@@ -71,7 +71,7 @@ bool MerchantContainer::isPaymentSlot(int slot)
shared_ptr<ItemInstance> MerchantContainer::removeItemNoUpdate(int slot)
{
if (items[slot] != NULL)
if (items[slot] != nullptr)
{
shared_ptr<ItemInstance> item = items[slot];
items[slot] = nullptr;
@@ -83,7 +83,7 @@ shared_ptr<ItemInstance> MerchantContainer::removeItemNoUpdate(int slot)
void MerchantContainer::setItem(unsigned int slot, shared_ptr<ItemInstance> item)
{
items[slot] = item;
if (item != NULL && item->count > getMaxStackSize()) item->count = getMaxStackSize();
if (item != nullptr && item->count > getMaxStackSize()) item->count = getMaxStackSize();
if (isPaymentSlot(slot))
{
updateSellItem();
@@ -135,37 +135,37 @@ void MerchantContainer::setChanged()
void MerchantContainer::updateSellItem()
{
activeRecipe = NULL;
activeRecipe = nullptr;
shared_ptr<ItemInstance> buyItem1 = items[MerchantMenu::PAYMENT1_SLOT];
shared_ptr<ItemInstance> buyItem2 = items[MerchantMenu::PAYMENT2_SLOT];
if (buyItem1 == NULL)
if (buyItem1 == nullptr)
{
buyItem1 = buyItem2;
buyItem2 = nullptr;
}
if (buyItem1 == NULL)
if (buyItem1 == nullptr)
{
setItem(MerchantMenu::RESULT_SLOT, nullptr);
}
else
{
MerchantRecipeList *offers = merchant->getOffers(player);
if (offers != NULL)
if (offers != nullptr)
{
MerchantRecipe *recipeFor = offers->getRecipeFor(buyItem1, buyItem2, selectionHint);
if (recipeFor != NULL && !recipeFor->isDeprecated())
if (recipeFor != nullptr && !recipeFor->isDeprecated())
{
activeRecipe = recipeFor;
setItem(MerchantMenu::RESULT_SLOT, recipeFor->getSellItem()->copy());
}
else if (buyItem2 != NULL)
else if (buyItem2 != nullptr)
{
// try to switch
recipeFor = offers->getRecipeFor(buyItem2, buyItem1, selectionHint);
if (recipeFor != NULL && !recipeFor->isDeprecated())
if (recipeFor != nullptr && !recipeFor->isDeprecated())
{
activeRecipe = recipeFor;
setItem(MerchantMenu::RESULT_SLOT, recipeFor->getSellItem()->copy());