mirror of
https://git.huckle.dev/Huckles-Minecraft-Archive/4jcraft.git
synced 2026-07-19 12:58:09 +00:00
refactor: replace NULL with nullptr across C++ codebase
Excludes vendored C libs (zlib, Miles, DirectXMath, boost, Iggy).
This commit is contained in:
@@ -10,14 +10,14 @@
|
||||
#include "../../../Minecraft.World/Headers/net.minecraft.world.item.h"
|
||||
|
||||
const float StatsScreen::SLOT_TEX_SIZE = 128.0f;
|
||||
ItemRenderer* StatsScreen::itemRenderer = NULL;
|
||||
ItemRenderer* StatsScreen::itemRenderer = nullptr;
|
||||
|
||||
StatsScreen::StatsScreen(Screen* lastScreen, StatsCounter* stats) {
|
||||
// 4J - added initialisers
|
||||
itemRenderer = new ItemRenderer();
|
||||
statsList = NULL;
|
||||
itemStatsList = NULL;
|
||||
blockStatsList = NULL;
|
||||
statsList = nullptr;
|
||||
itemStatsList = nullptr;
|
||||
blockStatsList = nullptr;
|
||||
this->lastScreen = lastScreen;
|
||||
this->stats = stats;
|
||||
}
|
||||
@@ -235,7 +235,7 @@ ItemStat* StatsScreen::StatisticsList::getSlotStat(int slot) {
|
||||
|
||||
void StatsScreen::StatisticsList::renderStat(ItemStat* stat, int x, int y,
|
||||
bool shaded) {
|
||||
if (stat != NULL) {
|
||||
if (stat != nullptr) {
|
||||
std::wstring msg = stat->format(parent->stats->getTotalValue(stat));
|
||||
parent->drawString(parent->font, msg, x - parent->font->width(msg),
|
||||
y + SLOT_TEXT_OFFSET, shaded ? 0xffffff : 0x909090);
|
||||
@@ -326,12 +326,12 @@ StatsScreen::ItemStatisticsList::ItemStatisticsList(StatsScreen* ss)
|
||||
{
|
||||
addToList = true;
|
||||
}
|
||||
else if (Stats::itemBroke[id] != NULL &&
|
||||
else if (Stats::itemBroke[id] != nullptr &&
|
||||
parent->stats->getTotalValue(Stats::itemBroke[id]) > 0)
|
||||
{
|
||||
addToList = true;
|
||||
}
|
||||
else if (Stats::itemCrafted[id] != NULL &&
|
||||
else if (Stats::itemCrafted[id] != nullptr &&
|
||||
parent->stats->getTotalValue(Stats::itemCrafted[id]) > 0)
|
||||
{
|
||||
addToList = true;
|
||||
@@ -450,12 +450,12 @@ StatsScreen::BlockStatisticsList::BlockStatisticsList(StatsScreen* ss)
|
||||
{
|
||||
addToList = true;
|
||||
}
|
||||
else if (Stats::itemUsed[id] != NULL &&
|
||||
else if (Stats::itemUsed[id] != nullptr &&
|
||||
parent->stats->getTotalValue(Stats::itemUsed[id]) > 0)
|
||||
{
|
||||
addToList = true;
|
||||
}
|
||||
else if (Stats::itemCrafted[id] != NULL &&
|
||||
else if (Stats::itemCrafted[id] != nullptr &&
|
||||
parent->stats->getTotalValue(Stats::itemCrafted[id]) > 0)
|
||||
{
|
||||
addToList = true;
|
||||
|
||||
Reference in New Issue
Block a user