From 29005e366cf8af39591e76f2b6f6382818e74e81 Mon Sep 17 00:00:00 2001 From: sigonasr2 Date: Wed, 14 Feb 2024 03:42:17 -0600 Subject: [PATCH] Stat labels no longer cause funny newline wrapping. Release Build 7170. --- .../CharacterMenuWindow.cpp | 4 ++-- Adventures in Lestoria/StatLabel.h | 2 +- Adventures in Lestoria/Version.h | 2 +- x64/Release/Adventures in Lestoria.exe | Bin 2883584 -> 2883584 bytes 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Adventures in Lestoria/CharacterMenuWindow.cpp b/Adventures in Lestoria/CharacterMenuWindow.cpp index 52ab3d05..18c41f88 100644 --- a/Adventures in Lestoria/CharacterMenuWindow.cpp +++ b/Adventures in Lestoria/CharacterMenuWindow.cpp @@ -105,7 +105,7 @@ void Menu::InitializeCharacterMenuWindow(){ equipSelectionSelectButton->Disable(); const static auto GetLabelText=[](ItemAttribute attribute){ - std::string attrStr=std::string(attribute.Name())+":\n "; + std::string attrStr=std::string(attribute.Name())+"\n "; attrStr+=std::to_string(game->GetPlayer()->GetStat(attribute)); if(attribute.DisplayAsPercent()){ attrStr+="%"; @@ -297,7 +297,7 @@ void Menu::InitializeCharacterMenuWindow(){ int yOffset=0; for(const std::string&attribute:displayAttrs){ std::string attrStr=GetLabelText(ItemAttribute::Get(attribute)); - auto attrLabel=characterMenuWindow->ADD("Attribute "+std::string(ItemAttribute::Get(attribute).Name())+" Label",StatLabel)(geom2d::rect{{245,28+2+float(yOffset)},{62,18}},ItemAttribute::Get(attribute),1,ComponentAttr::SHADOW|ComponentAttr::LEFT_ALIGN)END; + auto attrLabel=characterMenuWindow->ADD("Attribute "+std::string(ItemAttribute::Get(attribute).Name())+" Label",StatLabel)(geom2d::rect{{245,28+2+float(yOffset)},{62,18}},ItemAttribute::Get(attribute),1,ComponentAttr::SHADOW|ComponentAttr::LEFT_ALIGN|ComponentAttr::FIT_TO_LABEL)END; Menu::AddEquipStatListener(attrLabel); yOffset+=20; } diff --git a/Adventures in Lestoria/StatLabel.h b/Adventures in Lestoria/StatLabel.h index 0b051fff..58ddc755 100644 --- a/Adventures in Lestoria/StatLabel.h +++ b/Adventures in Lestoria/StatLabel.h @@ -72,7 +72,7 @@ protected: SetValue(game->GetPlayer()->GetStat(stat)); } inline void UpdateLabel(){ - std::string attrStr=std::string(stat.Name())+":\n "; + std::string attrStr=std::string(stat.Name())+"\n "; attrStr+=std::to_string(value); if(stat.DisplayAsPercent()){ attrStr+="%"; diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 23872079..cb8e32de 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 0 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 7167 +#define VERSION_BUILD 7170 #define stringify(a) stringify_(a) #define stringify_(a) #a diff --git a/x64/Release/Adventures in Lestoria.exe b/x64/Release/Adventures in Lestoria.exe index f105201ce068bb1c76102dcd37682144d30aac56..4712f1847216837ea9e43a7aa69893a0922cc507 100644 GIT binary patch delta 349 zcmYMvze)o^5C-s_+tZkswo4jZd< z1}sLq*!uucA0U;DU||vPyCOL7gJHg5VB)w(G4yxaDinOAX#fs$lJ4ti@A%E$B z&8K|!=#~$EWNDA8e6(#R0ZBcIY?y#a9z~hgYs*^J{Xqt%APYH|hCCFY2o98B24-On z%20uMSO6D1ScD}=@2Y5C-6#+lw(V$wf`{&d)pd)R>4M*r>f-IRAp6y+sN|gaeDUy=sLceYylJ zR;^-dXBYJcq_Pn#EP}pU1P2}%<{btmj(ZeC&nN!+^l~Fe3NkD$h+n>ut=jMWhmN%R z;13=p`uLld_bH=KcI-4DTaF?l0~2}_WuI@Y-$mIUWML9=kcTNKKoLsdKpCcC24@+kZHqHv@E6_sL`p=Zp5ngV*R8qTcJ<@SU+