aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.Client/AbstractContainerScreen.cpp
diff options
context:
space:
mode:
authorModMaker101 <119018978+ModMaker101@users.noreply.github.com>2026-03-08 19:08:36 -0400
committerGitHub <noreply@github.com>2026-03-08 18:08:36 -0500
commit28614b922fb77149a54da1a87bebfbc98736f296 (patch)
tree7f828ba86a4ee18d0a80d29de64f6199a5412512 /Minecraft.Client/AbstractContainerScreen.cpp
parent88798b501d0cf6287b6f87acb2592676e3cec58d (diff)
Modernize project codebase (#906)
* 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 * Add safety checks and fix a issue with vector going OOR
Diffstat (limited to 'Minecraft.Client/AbstractContainerScreen.cpp')
-rw-r--r--Minecraft.Client/AbstractContainerScreen.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/Minecraft.Client/AbstractContainerScreen.cpp b/Minecraft.Client/AbstractContainerScreen.cpp
index fbf1331d..c2de6dc9 100644
--- a/Minecraft.Client/AbstractContainerScreen.cpp
+++ b/Minecraft.Client/AbstractContainerScreen.cpp
@@ -51,7 +51,7 @@ void AbstractContainerScreen::render(int xm, int ym, float a)
glColor4f(1, 1, 1, 1);
glEnable(GL_RESCALE_NORMAL);
- Slot *hoveredSlot = NULL;
+ Slot *hoveredSlot = nullptr;
for ( Slot *slot : *menu->slots )
{
@@ -73,7 +73,7 @@ void AbstractContainerScreen::render(int xm, int ym, float a)
}
shared_ptr<Inventory> inventory = minecraft->player->inventory;
- if (inventory->getCarried() != NULL)
+ if (inventory->getCarried() != nullptr)
{
glTranslatef(0, 0, 32);
// Slot old = carriedSlot;
@@ -90,7 +90,7 @@ void AbstractContainerScreen::render(int xm, int ym, float a)
renderLabels();
- if (inventory->getCarried() == NULL && hoveredSlot != NULL && hoveredSlot->hasItem())
+ if (inventory->getCarried() == nullptr && hoveredSlot != nullptr && hoveredSlot->hasItem())
{
wstring elementName = trimString(Language::getInstance()->getElementName(hoveredSlot->getItem()->getDescriptionId()));
@@ -127,7 +127,7 @@ void AbstractContainerScreen::renderSlot(Slot *slot)
int y = slot->y;
shared_ptr<ItemInstance> item = slot->getItem();
- if (item == NULL)
+ if (item == nullptr)
{
int icon = slot->getNoItemIcon();
if (icon >= 0)
@@ -151,7 +151,7 @@ Slot *AbstractContainerScreen::findSlot(int x, int y)
{
if (isHovering(slot, x, y)) return slot;
}
- return NULL;
+ return nullptr;
}
bool AbstractContainerScreen::isHovering(Slot *slot, int xm, int ym)
@@ -177,7 +177,7 @@ void AbstractContainerScreen::mouseClicked(int x, int y, int buttonNum)
bool clickedOutside = (x < xo || y < yo || x >= xo + imageWidth || y >= yo + imageHeight);
int slotId = -1;
- if (slot != NULL) slotId = slot->index;
+ if (slot != nullptr) slotId = slot->index;
if (clickedOutside)
{
@@ -210,7 +210,7 @@ void AbstractContainerScreen::keyPressed(wchar_t eventCharacter, int eventKey)
void AbstractContainerScreen::removed()
{
- if (minecraft->player == NULL) return;
+ if (minecraft->player == nullptr) return;
}
void AbstractContainerScreen::slotsChanged(shared_ptr<Container> container)