diff options
Diffstat (limited to 'source')
| -rw-r--r-- | source/game/StarPlayerInventory.cpp | 3 | ||||
| -rw-r--r-- | source/rendering/StarWorldPainter.cpp | 4 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/game/StarPlayerInventory.cpp b/source/game/StarPlayerInventory.cpp index bacd58d..0fbcd66 100644 --- a/source/game/StarPlayerInventory.cpp +++ b/source/game/StarPlayerInventory.cpp @@ -547,8 +547,7 @@ void PlayerInventory::shiftSwap(InventorySlot const& slot) { } else if (auto bs = slot.ptr<BagSlot>()) { if (itemAllowedInBag(m_swapSlot, bs->first)) { m_swapSlot = m_bags[bs->first]->swapItems(bs->second, m_swapSlot); - if (m_swapSlot && !m_swapSlot->empty()) - swapCustomBarLinks(SwapSlot(), slot); + swapCustomBarLinks(SwapSlot(), slot); } } diff --git a/source/rendering/StarWorldPainter.cpp b/source/rendering/StarWorldPainter.cpp index e15f00b..8dc0f33 100644 --- a/source/rendering/StarWorldPainter.cpp +++ b/source/rendering/StarWorldPainter.cpp @@ -273,7 +273,7 @@ void WorldPainter::drawEntityLayer(List<Drawable> drawables, EntityHighlightEffe if (d.isImage()) { auto underlayDrawable = Drawable(d); underlayDrawable.fullbright = true; - underlayDrawable.color = Color::rgbaf(1, 1, 1, highlightEffect.level); + underlayDrawable.color = Color::rgbaf(1, 1, 1, highlightEffect.level * d.color.alphaF()); underlayDrawable.imagePart().addDirectives(underlayDirectives, true); drawDrawable(std::move(underlayDrawable)); } @@ -287,7 +287,7 @@ void WorldPainter::drawEntityLayer(List<Drawable> drawables, EntityHighlightEffe if (!overlayDirectives.empty() && d.isImage()) { auto overlayDrawable = Drawable(d); overlayDrawable.fullbright = true; - overlayDrawable.color = Color::rgbaf(1, 1, 1, highlightEffect.level); + overlayDrawable.color = Color::rgbaf(1, 1, 1, highlightEffect.level * d.color.alphaF()); overlayDrawable.imagePart().addDirectives(overlayDirectives, true); drawDrawable(std::move(overlayDrawable)); } |