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

fix inventory hotbar links breaking when moving an item

Browse Source
This commit is contained in:
Kae 2024-05-01 05:04:38 +10:00
parent 9e3048ea16
commit 789597dde4
3 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
assets/opensb/highlights.config.patch Normal file
View File

@ -0,0 +1,20 @@
{
"highlightDirectives" : {
"interactive" : {
"underlay" : "?outline=1;DDD;0000",
"overlay" : "?fade=AAA;0.1"
},
"inspectable" : {
"underlay" : "?outline=1;66FC;0000",
"overlay" : "?scanlines=55AC;0.4;55FC;0.4"
},
"interesting" : {
"underlay" : "?outline=1;8F8C;0000",
"overlay" : "?scanlines=6E6;0.5;5C5;0.5"
},
"inspected" : {
"underlay" : "?outline=1;E98C;0000",
"overlay" : "?scanlines=B76;0.5;A65;0.5"
}
}
}

1
source/game/StarPlayerInventory.cpp
View File

@ -547,7 +547,6 @@ void PlayerInventory::shiftSwap(InventorySlot const& slot) {
} else if (auto bs = slot.ptr<BagSlot>()) { } else if (auto bs = slot.ptr<BagSlot>()) {
if (itemAllowedInBag(m_swapSlot, bs->first)) { if (itemAllowedInBag(m_swapSlot, bs->first)) {
m_swapSlot = m_bags[bs->first]->swapItems(bs->second, m_swapSlot); m_swapSlot = m_bags[bs->first]->swapItems(bs->second, m_swapSlot);
if (m_swapSlot && !m_swapSlot->empty())
swapCustomBarLinks(SwapSlot(), slot); swapCustomBarLinks(SwapSlot(), slot);
} }
} }

4
source/rendering/StarWorldPainter.cpp
View File

@ -273,7 +273,7 @@ void WorldPainter::drawEntityLayer(List<Drawable> drawables, EntityHighlightEffe
if (d.isImage()) { if (d.isImage()) {
auto underlayDrawable = Drawable(d); auto underlayDrawable = Drawable(d);
underlayDrawable.fullbright = true; 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); underlayDrawable.imagePart().addDirectives(underlayDirectives, true);
drawDrawable(std::move(underlayDrawable)); drawDrawable(std::move(underlayDrawable));
} }
@ -287,7 +287,7 @@ void WorldPainter::drawEntityLayer(List<Drawable> drawables, EntityHighlightEffe
if (!overlayDirectives.empty() && d.isImage()) { if (!overlayDirectives.empty() && d.isImage()) {
auto overlayDrawable = Drawable(d); auto overlayDrawable = Drawable(d);
overlayDrawable.fullbright = true; 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); overlayDrawable.imagePart().addDirectives(overlayDirectives, true);
drawDrawable(std::move(overlayDrawable)); drawDrawable(std::move(overlayDrawable));
} }