LegacyConsole/4jcraft
3
0
Fork 0
mirror of https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git synced 2026-06-05 12:25:50 +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

6
Minecraft.World/Containers/MerchantMenu.cpp
View File

@@ -62,10 +62,10 @@ bool MerchantMenu::stillValid(std::shared_ptr<Player> player) {
std::shared_ptr<ItemInstance> MerchantMenu::quickMoveStack(
std::shared_ptr<Player> player, int slotIndex) {
std::shared_ptr<ItemInstance> clicked = nullptr;
Slot* slot = NULL;
Slot* slot = nullptr;
if (slotIndex < slots.size()) slot = slots.at(slotIndex);
if (slot != NULL && slot->hasItem()) {
if (slot != nullptr && slot->hasItem()) {
std::shared_ptr<ItemInstance> stack = slot->getItem();
clicked = stack->copy();
@@ -118,7 +118,7 @@ void MerchantMenu::removed(std::shared_ptr<Player> player) {
player->drop(item);
}
item = tradeContainer->removeItemNoUpdate(PAYMENT2_SLOT);
if (item != NULL) {
if (item != nullptr) {
player->drop(item);
}
}