xrGame/ui/UIActorMenu: support SOC weight indicators (OpenXRay#392)

mortany · Feb 18, 2020 · 0d13ac4 · 0d13ac4
1 parent a5ccd07
commit 0d13ac4
Show file tree

Hide file tree

Showing 5 changed files with 41 additions and 4 deletions.
diff --git a/src/xrGame/ui/UIActorMenuInitialize.cpp b/src/xrGame/ui/UIActorMenuInitialize.cpp
@@ -284,7 +284,7 @@ void CUIActorMenu::InitializeInventoryMode(CUIXml& uiXml)
  UIHelper::CreateStatic(uiXml, "belt_slots", m_pInventoryWnd);
  UIHelper::CreateStatic(uiXml, "back", m_pInventoryWnd);
  UIHelper::CreateStatic(uiXml, "bottom_static", m_pInventoryWnd);
- CUIStatic* bagWnd = UIHelper::CreateStatic(uiXml, "bag_static", m_pInventoryWnd);
+ m_ActorWeightBar->m_BagWnd = UIHelper::CreateStatic(uiXml, "bag_static", m_pInventoryWnd);
 
  m_ActorMoney = UIHelper::CreateStatic(uiXml, "money_static", m_pInventoryWnd);
 
@@ -308,7 +308,7 @@ void CUIActorMenu::InitializeInventoryMode(CUIXml& uiXml)
  { eInventoryAutomaticList, "dragdrop_automatic", m_pInventoryWnd },
  { eInventoryOutfitList, "dragdrop_outfit", m_pInventoryWnd },
  { eInventoryBeltList, "dragdrop_belt", m_pInventoryWnd },
- { eInventoryBagList, "dragdrop_bag", bagWnd },
+ { eInventoryBagList, "dragdrop_bag", m_ActorWeightBar->m_BagWnd },
  };
  for (auto [id, section, parent] : inventory_lists)
  {
@@ -410,10 +410,10 @@ void CUIActorMenu::InitializeSearchLootMode(CUIXml& uiXml)
  m_SearchLootPartnerCharacterInfo->SetAutoDelete(true);
  m_SearchLootPartnerCharacterInfo->InitCharacterInfo({ 0.f, 0.f }, partnerIcon->GetWndSize(), TRADE_CHARACTER_XML);
 
- CUIStatic* actorBagWnd = UIHelper::CreateStatic(uiXml, "our_bag_static", m_pSearchLootWnd);
+ m_ActorWeightBar->m_BagWnd2 = UIHelper::CreateStatic(uiXml, "our_bag_static", m_pSearchLootWnd);
  CUIStatic* partnerBagWnd = UIHelper::CreateStatic(uiXml, "others_bag_static", m_pSearchLootWnd);
 
- m_pLists[eSearchLootActorBagList] = UIHelper::CreateDragDropListEx(uiXml, "dragdrop_list_our", actorBagWnd);
+ m_pLists[eSearchLootActorBagList] = UIHelper::CreateDragDropListEx(uiXml, "dragdrop_list_our", m_ActorWeightBar->m_BagWnd2);
  m_pLists[eSearchLootBagList] = UIHelper::CreateDragDropListEx(uiXml, "dragdrop_list_other", partnerBagWnd);
 
  // Item info

diff --git a/src/xrGame/ui/UIInventoryUtilities.cpp b/src/xrGame/ui/UIInventoryUtilities.cpp
@@ -361,6 +361,32 @@ LPCSTR InventoryUtilities::GetTimePeriodAsString(LPSTR _buff, u32 buff_sz, ALife
  return _buff;
 }
 
+void InventoryUtilities::UpdateWeight(CUIStatic& wnd, CInventoryOwner* pInvOwner, bool withPrefix /*= false*/)
+{
+ R_ASSERT(pInvOwner);
+ string128 buf;
+
+ float total = pInvOwner->inventory().CalcTotalWeight();
+ float max = pInvOwner->MaxCarryWeight();
+
+ string16 cl;
+
+ if (total > max)
+ xr_strcpy(cl, "%c[red]");
+ else
+ xr_strcpy(cl, "%c[UI_orange]");
+
+ string32 prefix;
+
+ if (withPrefix)
+ xr_sprintf(prefix, "%%c[default]%s ", StringTable().translate("ui_inv_weight"));
+ else
+ xr_strcpy(prefix, "");
+
+ xr_sprintf(buf, "%s%s%3.1f %s/%5.1f", prefix, cl, total, "%c[UI_orange]", max);
+ wnd.SetText(buf);
+}
+
 //////////////////////////////////////////////////////////////////////////
 
 void InventoryUtilities::UpdateWeightStr(CUITextWnd& wnd, CUITextWnd& wnd_max, CInventoryOwner* pInvOwner)

diff --git a/src/xrGame/ui/UIInventoryUtilities.h b/src/xrGame/ui/UIInventoryUtilities.h
@@ -74,6 +74,7 @@ const shared_str Get_GameTimeAndDate_AsString();
 
 LPCSTR GetTimePeriodAsString(LPSTR _buff, u32 buff_sz, ALife::_TIME_ID _from, ALife::_TIME_ID _to);
 // Отобразить вес, который несет (*pInvOwner)
+void UpdateWeight(CUIStatic& wnd, CInventoryOwner* pInvOwner, bool withPrefix = false);
 void UpdateWeightStr(CUITextWnd& wnd, CUITextWnd& wnd_max, CInventoryOwner* pInvOwner);
 
 // Функции получения строки-идентификатора ранга и отношения по их числовому идентификатору

diff --git a/src/xrGame/ui/UIWeightBar.cpp b/src/xrGame/ui/UIWeightBar.cpp
@@ -44,6 +44,12 @@ void CUIWeightBar::UpdateData(float weight)
 
 void CUIWeightBar::UpdateData(CInventoryOwner* pInvOwner)
 {
+ if (m_BagWnd)
+ InventoryUtilities::UpdateWeight(*m_BagWnd, pInvOwner, true);
+
+ if (m_BagWnd2)
+ InventoryUtilities::UpdateWeight(*m_BagWnd2, pInvOwner, false);
+
  if (!m_Weight || !m_WeightMax || !m_BottomInfo)
  return;
  InventoryUtilities::UpdateWeightStr(*m_Weight, *m_WeightMax, pInvOwner);

diff --git a/src/xrGame/ui/UIWeightBar.h b/src/xrGame/ui/UIWeightBar.h
@@ -7,6 +7,10 @@ class CUIWeightBar : public CUIWindow
  CUITextWnd* m_WeightMax{};
  float m_Weight_end_x{};
 
+public:
+ CUIStatic* m_BagWnd{};
+ CUIStatic* m_BagWnd2{};
+
 public:
  void init_from_xml(CUIXml& uiXml, pcstr path);
  void UpdateData(float weight);