From cbdd3170683bef1172ec23a52bf08e1da1d58981 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Sun, 31 Dec 2023 23:36:09 -0600 Subject: [PATCH] Add label update manual disable flag for when a label update would cause issues on the character equip menu. --- Crawler/CharacterMenuWindow.cpp | 2 +- Crawler/MenuItemItemButton.h | 6 ++++-- Crawler/RowItemDisplay.h | 2 +- Crawler/Version.h | 2 +- 4 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Crawler/CharacterMenuWindow.cpp b/Crawler/CharacterMenuWindow.cpp index fc12f0a0..c111f5ba 100644 --- a/Crawler/CharacterMenuWindow.cpp +++ b/Crawler/CharacterMenuWindow.cpp @@ -162,7 +162,7 @@ void Menu::InitializeCharacterMenuWindow(){ statDisplayLabel->SetStatChangeAmt(0); } MenuItemItemButton*equipButton=Component(CHARACTER_MENU,"Equip Slot "+slotNames[data.parentComponent->I(A::INDEXED_THEME)]); - equipButton->SetItem(comp->GetItem()); + equipButton->SetItem(comp->GetItem(),false); } }else{ ERR("WARNING! Attempting to cast a button that isn't a RowItemDisplay!"); diff --git a/Crawler/MenuItemItemButton.h b/Crawler/MenuItemItemButton.h index 773c2b5f..d86aa18c 100644 --- a/Crawler/MenuItemItemButton.h +++ b/Crawler/MenuItemItemButton.h @@ -73,10 +73,12 @@ public: inline const std::weak_ptrGetItem(){ return itemRef; } - inline const std::weak_ptrSetItem(const std::weak_ptrnewItem){ + inline const std::weak_ptrSetItem(const std::weak_ptrnewItem,bool labelUpdate=true){ itemRef=newItem; + if(labelUpdate){ + UpdateLabel(); + } UpdateIcon(); - UpdateLabel(); return itemRef; } inline void SetShowQuantity(bool show){ diff --git a/Crawler/RowItemDisplay.h b/Crawler/RowItemDisplay.h index 46437eb5..845eaae5 100644 --- a/Crawler/RowItemDisplay.h +++ b/Crawler/RowItemDisplay.h @@ -68,7 +68,7 @@ public: } virtual inline void DrawDecal(ViewPort&window,bool focused)override{ bool canEnhance=itemRef.lock()->CanEnhanceItem(); - bool locked=itemRef.lock()->EnhancementIsPossible()&&itemRef.lock()->GetEnhancementInfo().AvailableChapter()>game->GetCurrentChapter(); + bool locked=fadeOutIfMissingRequirements&&itemRef.lock()->EnhancementIsPossible()&&itemRef.lock()->GetEnhancementInfo().AvailableChapter()>game->GetCurrentChapter(); MenuComponent::DrawDecal(window,focused); diff --git a/Crawler/Version.h b/Crawler/Version.h index ddb272c7..ea6235cf 100644 --- a/Crawler/Version.h +++ b/Crawler/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 2 #define VERSION_PATCH 1 -#define VERSION_BUILD 5180 +#define VERSION_BUILD 5182 #define stringify(a) stringify_(a) #define stringify_(a) #a