Веб-сайт самохостера Lotigara

summaryrefslogtreecommitdiff
path: root/source/game/StarWorldClient.cpp
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2023-08-21 00:59:02 +1000
committerKae <80987908+Novaenia@users.noreply.github.com>2023-08-21 00:59:02 +1000
commita7ae03427805cdf0886ca9eb40add54cf970fc4f (patch)
treed8b4c7d81b485e7a1bbe7ed3584bb34b5eb9fda4 /source/game/StarWorldClient.cpp
parentedbee201ee2debbe56e27636760a9d650b8ff685 (diff)
Objects can now be placed under tiles that have non-block collision
Diffstat (limited to 'source/game/StarWorldClient.cpp')
-rw-r--r--source/game/StarWorldClient.cpp10
1 files changed, 8 insertions, 2 deletions
diff --git a/source/game/StarWorldClient.cpp b/source/game/StarWorldClient.cpp
index 6f4c68d..547c21d 100644
--- a/source/game/StarWorldClient.cpp
+++ b/source/game/StarWorldClient.cpp
@@ -238,10 +238,16 @@ EntityPtr WorldClient::findEntityAtTile(Vec2I const& pos, EntityFilterOf<TileEnt
return m_entityMap->findEntityAtTile(pos, entityFilter);
}
-bool WorldClient::tileIsOccupied(Vec2I const& pos, TileLayer layer, bool includeEphemeral) const {
+bool WorldClient::tileIsOccupied(Vec2I const& pos, TileLayer layer, bool includeEphemeral, bool checkCollision) const {
if (!inWorld())
return false;
- return WorldImpl::tileIsOccupied(m_tileArray, m_entityMap, pos, layer, includeEphemeral);
+ return WorldImpl::tileIsOccupied(m_tileArray, m_entityMap, pos, layer, includeEphemeral, checkCollision);
+}
+
+CollisionKind WorldClient::tileCollisionKind(Vec2I const& pos) const {
+ if (!inWorld())
+ return CollisionKind::Null;
+ return WorldImpl::tileCollisionKind(m_tileArray, m_entityMap, pos);
}
void WorldClient::forEachCollisionBlock(RectI const& region, function<void(CollisionBlock const&)> const& iterator) const {