evert/osb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Material Item: Allow entity overlap on non-solid collision kinds

Browse Source
This commit is contained in:
Kae 2023-08-20 20:52:56 +10:00
parent ecadfa7e44
commit 33b7f17bb2
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/game/items/StarMaterialItem.cpp
View File

@ -190,6 +190,10 @@ void MaterialItem::fire(FireMode mode, bool shifting, bool edgeTriggered) {
steps = (unsigned)ceil(magnitude * (Constants::pi / 2)); steps = (unsigned)ceil(magnitude * (Constants::pi / 2));
} }
CollisionKind collisionKind = m_collisionOverride != TileCollisionOverride::None
? collisionKindFromOverride(m_collisionOverride)
: Root::singleton().materialDatabase()->materialCollisionKind(m_material);
size_t total = 0; size_t total = 0;
for (int i = 0; i != steps; ++i) { for (int i = 0; i != steps; ++i) {
auto placementOrigin = aimPosition + diff * (1.0f - ((float)i / steps)); auto placementOrigin = aimPosition + diff * (1.0f - ((float)i / steps));
@ -202,7 +206,7 @@ void MaterialItem::fire(FireMode mode, bool shifting, bool edgeTriggered) {
// Make sure not to make any more modifications than we have consumables. // Make sure not to make any more modifications than we have consumables.
if (modifications.size() > count()) if (modifications.size() > count())
modifications.resize(count()); modifications.resize(count());
size_t failed = world()->applyTileModifications(modifications, false).size(); size_t failed = world()->applyTileModifications(modifications, collisionKind <= CollisionKind::Platform).size();
if (failed < modifications.size()) { if (failed < modifications.size()) {
size_t placed = modifications.size() - failed; size_t placed = modifications.size() - failed;
consume(placed); consume(placed);