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

summaryrefslogtreecommitdiff
path: root/source/game/StarWorldClient.cpp
diff options
context:
space:
mode:
authorKae <80987908+Novaenia@users.noreply.github.com>2023-08-19 18:26:52 +1000
committerKae <80987908+Novaenia@users.noreply.github.com>2023-08-19 18:26:52 +1000
commitec4f70340e0f9a3a867aef7d39df19457bec1d3e (patch)
tree32ee125d2ff837b0e6b5b5db20881f60f56b79ec /source/game/StarWorldClient.cpp
parentf22eed8304c90418314e254f2569bb87ee5d72fc (diff)
Allow overriding placed collision kind ("""overground""") from world.placeMaterial
Diffstat (limited to 'source/game/StarWorldClient.cpp')
-rw-r--r--source/game/StarWorldClient.cpp5
1 files changed, 4 insertions, 1 deletions
diff --git a/source/game/StarWorldClient.cpp b/source/game/StarWorldClient.cpp
index cfc0827..753cbd5 100644
--- a/source/game/StarWorldClient.cpp
+++ b/source/game/StarWorldClient.cpp
@@ -2224,7 +2224,10 @@ void WorldClient::informTilePrediction(Vec2I const& pos, TileModification const&
if (placeMaterial->layer == TileLayer::Foreground) {
p.foreground = placeMaterial->material;
p.foregroundHueShift = placeMaterial->materialHueShift;
- p.collision = Root::singleton().materialDatabase()->materialCollisionKind(placeMaterial->material);
+ if (placeMaterial->collisionOverride != TileCollisionOverride::None)
+ p.collision = collisionKindFromOverride(placeMaterial->collisionOverride);
+ else
+ p.collision = Root::singleton().materialDatabase()->materialCollisionKind(placeMaterial->material);
dirtyCollision(RectI::withSize(pos, { 1, 1 }));
} else {
p.background = placeMaterial->material;