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:
@@ -20,7 +20,7 @@ int TripWireTile::getTickDelay(Level *level)
|
||||
|
||||
AABB *TripWireTile::getAABB(Level *level, int x, int y, int z)
|
||||
{
|
||||
return nullptr;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
bool TripWireTile::blocksLight()
|
||||
@@ -106,7 +106,7 @@ void TripWireTile::playerWillDestroy(Level *level, int x, int y, int z, int data
|
||||
{
|
||||
if (level->isClientSide) return;
|
||||
|
||||
if (player->getSelectedItem() != nullptr && player->getSelectedItem()->id == Item::shears_Id)
|
||||
if (player->getSelectedItem() != NULL && player->getSelectedItem()->id == Item::shears_Id)
|
||||
{
|
||||
level->setData(x, y, z, data | MASK_DISARMED, Tile::UPDATE_NONE);
|
||||
}
|
||||
@@ -165,7 +165,7 @@ void TripWireTile::checkPressed(Level *level, int x, int y, int z)
|
||||
bool wasPressed = (data & MASK_POWERED) == MASK_POWERED;
|
||||
bool shouldBePressed = false;
|
||||
|
||||
ThreadStorage *tls = static_cast<ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
ThreadStorage *tls = (ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
vector<shared_ptr<Entity> > *entities = level->getEntities(nullptr, AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, y + tls->yy1, z + tls->zz1));
|
||||
if (!entities->empty())
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user