resolved most of the compiler warnings/errors under gcc

also update xxhash and tinyformat

1 files changed, 4 insertions, 4 deletions

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());