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:
@@ -21,7 +21,7 @@ Icon *ButtonTile::getTexture(int face, int data)
|
||||
|
||||
AABB *ButtonTile::getAABB(Level *level, int x, int y, int z)
|
||||
{
|
||||
return nullptr;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
int ButtonTile::getTickDelay(Level *level)
|
||||
@@ -302,7 +302,7 @@ void ButtonTile::checkPressed(Level *level, int x, int y, int z)
|
||||
bool shouldBePressed;
|
||||
|
||||
updateShape(data);
|
||||
Tile::ThreadStorage *tls = static_cast<Tile::ThreadStorage *>(TlsGetValue(Tile::tlsIdxShape));
|
||||
Tile::ThreadStorage *tls = (Tile::ThreadStorage *)TlsGetValue(Tile::tlsIdxShape);
|
||||
vector<shared_ptr<Entity> > *entities = level->getEntitiesOfClass(typeid(Arrow), AABB::newTemp(x + tls->xx0, y + tls->yy0, z + tls->zz0, x + tls->xx1, y + tls->yy1, z + tls->zz1));
|
||||
shouldBePressed = !entities->empty();
|
||||
delete entities;
|
||||
|
||||
Reference in New Issue
Block a user