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

Update StarItemDrop.cpp

Browse Source
This commit is contained in:
Kae 2023-08-20 19:05:24 +10:00
parent 6e7c0498ef
commit d0aa7c1279
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
source/game/StarItemDrop.cpp
View File

@ -263,7 +263,7 @@ void ItemDrop::update(float dt, uint64_t) {
} }
bool ItemDrop::shouldDestroy() const { bool ItemDrop::shouldDestroy() const {
return m_mode.get() == Mode::Dead || m_item->empty(); return m_mode.get() == Mode::Dead || (m_item->empty() && m_mode.get() != Mode::Taken);
} }
void ItemDrop::render(RenderCallback* renderCallback) { void ItemDrop::render(RenderCallback* renderCallback) {
@ -417,11 +417,12 @@ ItemDrop::ItemDrop() {
} }
void ItemDrop::updateCollisionPoly() { void ItemDrop::updateCollisionPoly() {
RectF fallback = RectF{ -0.499, -0.499, 0.499, 0.499 };
if (auto mat = as<MaterialItem>(m_item.get())) if (auto mat = as<MaterialItem>(m_item.get()))
m_boundBox = RectF{ -0.5, -0.5, 0.5, 0.5 }; m_boundBox = fallback;
else { else {
m_boundBox = Drawable::boundBoxAll(m_item->dropDrawables(), true); m_boundBox = Drawable::boundBoxAll(m_item->dropDrawables(), true);
m_boundBox.rangeSetIfEmpty(RectF{ -0.5, -0.5, 0.5, 0.5 }); m_boundBox.rangeSetIfEmpty(fallback);
} }
MovementParameters parameters; MovementParameters parameters;
parameters.collisionPoly = PolyF(collisionArea()); parameters.collisionPoly = PolyF(collisionArea());