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

summaryrefslogtreecommitdiff
path: root/source/frontend
diff options
context:
space:
mode:
authorWasabiRaptor <ketchupraptor@gmail.com>2025-05-25 13:24:44 -0400
committerWasabiRaptor <ketchupraptor@gmail.com>2025-05-25 13:24:44 -0400
commit59854f015602b791b51c20a008e78aaed68d20b9 (patch)
tree7b2f17dc60ad192fddec182f982f6feb5781eddd /source/frontend
parent96b86c63fd168df1a8463f184932d1b39c4284ec (diff)
parent1eac38c5526f6d4deee811e9995ed5579cdda46c (diff)
Merge branch 'main' into networked-animator-improvements
Diffstat (limited to 'source/frontend')
-rw-r--r--source/frontend/StarActionBar.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/source/frontend/StarActionBar.cpp b/source/frontend/StarActionBar.cpp
index 9f78626..7a850b7 100644
--- a/source/frontend/StarActionBar.cpp
+++ b/source/frontend/StarActionBar.cpp
@@ -172,7 +172,8 @@ bool ActionBar::sendEvent(InputEvent const& event) {
}
for (auto action : context()->actions(event)) {
- if (action >= InterfaceAction::InterfaceBar1 && action <= InterfaceAction::InterfaceBar6)
+ if (action >= InterfaceAction::InterfaceBar1 && action <= InterfaceAction::InterfaceBar10
+ && ((int)action - (int)InterfaceAction::InterfaceBar1) < inventory->customBarIndexes())
inventory->selectActionBarLocation((CustomBarIndex)((int)action - (int)InterfaceAction::InterfaceBar1));
if (action >= InterfaceAction::EssentialBar1 && action <= InterfaceAction::EssentialBar4)