aboutsummaryrefslogtreecommitdiff
path: root/Minecraft.World/TileEntity.cpp
diff options
context:
space:
mode:
authorLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
committerLoki Rautio <lokirautio@gmail.com>2026-03-07 21:12:22 -0600
commit087b7e7abfe81dd7f0fdcdea36ac9f245950df1a (patch)
tree69454763e73ca764af4e682d3573080b13138a0e /Minecraft.World/TileEntity.cpp
parenta9be52c41a02d207233199e98898fe7483d7e817 (diff)
Revert "Project modernization (#630)"
This code was not tested and breaks in Release builds, reverting to restore functionality of the nightly. All in-game menus do not work and generating a world crashes. This reverts commit a9be52c41a02d207233199e98898fe7483d7e817.
Diffstat (limited to 'Minecraft.World/TileEntity.cpp')
-rw-r--r--Minecraft.World/TileEntity.cpp16
1 files changed, 8 insertions, 8 deletions
diff --git a/Minecraft.World/TileEntity.cpp b/Minecraft.World/TileEntity.cpp
index 1fff44bb..1eb9cab2 100644
--- a/Minecraft.World/TileEntity.cpp
+++ b/Minecraft.World/TileEntity.cpp
@@ -46,11 +46,11 @@ void TileEntity::setId(tileEntityCreateFn createFn, eINSTANCEOF clas, wstring id
TileEntity::TileEntity()
{
- level = nullptr;
+ level = NULL;
x = y = z = 0;
remove = false;
data = -1;
- tile = nullptr;
+ tile = NULL;
renderRemoveStage = e_RenderRemoveStageKeep;
}
@@ -66,7 +66,7 @@ void TileEntity::setLevel(Level *level)
bool TileEntity::hasLevel()
{
- return level != nullptr;
+ return level != NULL;
}
void TileEntity::load(CompoundTag *tag)
@@ -101,7 +101,7 @@ shared_ptr<TileEntity> TileEntity::loadStatic(CompoundTag *tag)
auto it = idCreateMap.find(tag->getString(L"id"));
if (it != idCreateMap.end())
entity = shared_ptr<TileEntity>(it->second());
- if (entity != nullptr)
+ if (entity != NULL)
{
entity->load(tag);
}
@@ -129,11 +129,11 @@ void TileEntity::setData(int data, int updateFlags)
void TileEntity::setChanged()
{
- if (level != nullptr)
+ if (level != NULL)
{
data = level->getData(x, y, z);
level->tileEntityChanged(x, y, z, shared_from_this());
- if (getTile() != nullptr) level->updateNeighbourForOutputSignal(x, y, z, getTile()->id);
+ if (getTile() != NULL) level->updateNeighbourForOutputSignal(x, y, z, getTile()->id);
}
}
@@ -152,7 +152,7 @@ double TileEntity::getViewDistance()
Tile *TileEntity::getTile()
{
- if( tile == nullptr ) tile = Tile::tiles[level->getTile(x, y, z)];
+ if( tile == NULL ) tile = Tile::tiles[level->getTile(x, y, z)];
return tile;
}
@@ -183,7 +183,7 @@ bool TileEntity::triggerEvent(int b0, int b1)
void TileEntity::clearCache()
{
- tile = nullptr;
+ tile = NULL;
data = -1;
}