LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-07-19 17:08:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

refactor: replace NULL with nullptr across C++ codebase

Browse Source 
Excludes vendored C libs (zlib, Miles, DirectXMath, boost, Iggy).
This commit is contained in:
MatthewBeshay
2026-03-30 16:25:52 +11:00
parent a330ecdcbb
commit dfb0e3b03e
752 changed files with 5396 additions and 5396 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Minecraft.World/Containers/MerchantRecipe.cpp
View File

@@ -46,7 +46,7 @@ std::shared_ptr<ItemInstance> MerchantRecipe::getBuyAItem() { return buyA; }
std::shared_ptr<ItemInstance> MerchantRecipe::getBuyBItem() { return buyB; }
bool MerchantRecipe::hasSecondaryBuyItem() { return buyB != NULL; }
bool MerchantRecipe::hasSecondaryBuyItem() { return buyB != nullptr; }
std::shared_ptr<ItemInstance> MerchantRecipe::getSellItem() { return sell; }
@@ -54,15 +54,15 @@ bool MerchantRecipe::isSame(MerchantRecipe* other) {
if (buyA->id != other->buyA->id || sell->id != other->sell->id) {
return false;
}
return (buyB == NULL && other->buyB == NULL) ||
(buyB != NULL && other->buyB != NULL && buyB->id == other->buyB->id);
return (buyB == nullptr && other->buyB == nullptr) ||
(buyB != nullptr && other->buyB != nullptr && buyB->id == other->buyB->id);
}
bool MerchantRecipe::isSameSameButBetter(MerchantRecipe* other) {
// same deal, but cheaper
return isSame(other) &&
(buyA->count < other->buyA->count ||
(buyB != NULL && buyB->count < other->buyB->count));
(buyB != nullptr && buyB->count < other->buyB->count));
}
int MerchantRecipe::getUses() { return uses; }
@@ -99,7 +99,7 @@ CompoundTag* MerchantRecipe::createTag() {
CompoundTag* tag = new CompoundTag();
tag->putCompound(L"buy", buyA->save(new CompoundTag(L"buy")));
tag->putCompound(L"sell", sell->save(new CompoundTag(L"sell")));
if (buyB != NULL) {
if (buyB != nullptr) {
tag->putCompound(L"buyB", buyB->save(new CompoundTag(L"buyB")));
}
tag->putInt(L"uses", uses);