From 02632b248c9fcf9c71d9099e2ac857d8b3d44393 Mon Sep 17 00:00:00 2001 From: Kae <80987908+Novaenia@users.noreply.github.com> Date: Mon, 1 Apr 2024 10:30:03 +1100 Subject: Fix more cases of tile collision not taking object material spaces into account Fixes #53 --- source/game/StarWorldClient.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source/game/StarWorldClient.cpp') diff --git a/source/game/StarWorldClient.cpp b/source/game/StarWorldClient.cpp index 535980b..b1ad698 100644 --- a/source/game/StarWorldClient.cpp +++ b/source/game/StarWorldClient.cpp @@ -256,7 +256,7 @@ void WorldClient::forEachCollisionBlock(RectI const& region, function(this)->freshenCollision(region); m_tileArray->tileEach(region, [iterator](Vec2I const& pos, ClientTile const& tile) { - if (tile.collision == CollisionKind::Null) { + if (tile.getCollision() == CollisionKind::Null) { iterator(CollisionBlock::nullBlock(pos)); } else { starAssert(!tile.collisionCacheDirty); @@ -1760,7 +1760,7 @@ void WorldClient::initWorld(WorldStartPacket const& startPacket) { m_weather.setup(m_geometry, [this](Vec2I const& pos) { auto const& tile = m_tileArray->tile(pos); - return !isRealMaterial(tile.background) && !isSolidColliding(tile.collision); + return !isRealMaterial(tile.background) && !isSolidColliding(tile.getCollision()); }); m_weather.readUpdate(startPacket.weatherData); -- cgit v1.2.3