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 a9be52c41a.
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user