diff options
Diffstat (limited to 'source/frontend')
-rw-r--r-- | source/frontend/StarClientCommandProcessor.cpp | 2 | ||||
-rw-r--r-- | source/frontend/StarMainInterface.cpp | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/source/frontend/StarClientCommandProcessor.cpp b/source/frontend/StarClientCommandProcessor.cpp index 535403d..bf9a434 100644 --- a/source/frontend/StarClientCommandProcessor.cpp +++ b/source/frontend/StarClientCommandProcessor.cpp @@ -332,7 +332,7 @@ String ClientCommandProcessor::giveEssentialItem(StringList const& arguments) { auto slot = EssentialItemNames.getLeft(arguments.at(1)); m_universeClient->mainPlayer()->inventory()->setEssentialItem(slot, item); return strf("Put %s in player slot %s", item->name(), arguments.at(1)); - } catch (MapException e) { + } catch (MapException const& e) { return strf("Invalid essential item slot %s.", arguments.at(1)); } } diff --git a/source/frontend/StarMainInterface.cpp b/source/frontend/StarMainInterface.cpp index cc09895..8a3d18b 100644 --- a/source/frontend/StarMainInterface.cpp +++ b/source/frontend/StarMainInterface.cpp @@ -237,8 +237,8 @@ void MainInterface::openMerchantWindow(Json const& config, EntityId sourceEntity [this](PanePtr const&) { if (auto player = m_client->mainPlayer()) player->clearSwap(); - m_paneManager.dismissRegisteredPane(MainInterfacePanes::Inventory); - }); + m_paneManager.dismissRegisteredPane(MainInterfacePanes::Inventory); + }); m_paneManager.displayRegisteredPane(MainInterfacePanes::Inventory); m_paneManager.bringPaneAdjacent(m_paneManager.registeredPane(MainInterfacePanes::Inventory), @@ -406,8 +406,8 @@ void MainInterface::handleInteractAction(InteractAction interactAction) { m_paneManager.displayPane(PaneLayer::Window, m_containerPane, [this](PanePtr const&) { if (auto player = m_client->mainPlayer()) player->clearSwap(); - m_paneManager.dismissRegisteredPane(MainInterfacePanes::Inventory); - }); + m_paneManager.dismissRegisteredPane(MainInterfacePanes::Inventory); + }); m_paneManager.bringPaneAdjacent(m_paneManager.registeredPane(MainInterfacePanes::Inventory), m_containerPane, Root::singleton().assets()->json("/interface.config:bringAdjacentWindowGap").toFloat()); |