diff --git a/Adventures in Lestoria/MenuFragmentItemButton.h b/Adventures in Lestoria/MenuFragmentItemButton.h index 45c57056..f274e2dc 100644 --- a/Adventures in Lestoria/MenuFragmentItemButton.h +++ b/Adventures in Lestoria/MenuFragmentItemButton.h @@ -95,6 +95,7 @@ protected: } virtual inline void DrawDecal(ViewPort&window,bool focused)override{ MenuComponent::DrawDecal(window,focused); + if(fragment)window.DrawRotatedDecal(rect.middle(),fragment->Icon().Decal(),0.f,fragment->Icon().Sprite()->Size()/2,iconScale,tint); if(valid&&!hideQty){ if(!ISBLANK(itemRef)&&!itemRef.lock()->IsEquippable()){ std::string quantityText="x"+std::to_string(itemRef.lock()->Amt()); @@ -106,6 +107,5 @@ protected: } } } - if(fragment)window.DrawRotatedDecal(rect.middle(),fragment->Icon().Decal(),0.f,fragment->Icon().Sprite()->Size()/2,iconScale,tint); } }; \ No newline at end of file diff --git a/Adventures in Lestoria/MenuItemItemButton.h b/Adventures in Lestoria/MenuItemItemButton.h index 50db9bda..9246d7c4 100644 --- a/Adventures in Lestoria/MenuItemItemButton.h +++ b/Adventures in Lestoria/MenuItemItemButton.h @@ -146,6 +146,10 @@ protected: } virtual inline void DrawDecal(ViewPort&window,bool focused)override{ MenuComponent::DrawDecal(window,focused); + if(icon){ + if(!itemRef.expired()&&ITEM_DATA[itemRef.lock()->ActualName()].IsFragmentOf())window.DrawRotatedDecal(rect.middle(),itemRef.lock()->Icon().Decal(),0.f,itemRef.lock()->Icon().Sprite()->Size()/2,iconScale,tint); + else window.DrawRotatedDecal(rect.middle(),GFX[*icon].Decal(),0.f,GFX[*icon].Sprite()->Size()/2,iconScale,tint); + } if(valid&&!hideQty){ if(!ISBLANK(itemRef)&&!itemRef.lock()->IsEquippable()){ std::string quantityText="x"+std::to_string(itemRef.lock()->Amt()); @@ -157,9 +161,5 @@ protected: } } } - if(icon){ - if(!itemRef.expired()&&ITEM_DATA[itemRef.lock()->ActualName()].IsFragmentOf())window.DrawRotatedDecal(rect.middle(),itemRef.lock()->Icon().Decal(),0.f,itemRef.lock()->Icon().Sprite()->Size()/2,iconScale,tint); - else window.DrawRotatedDecal(rect.middle(),GFX[*icon].Decal(),0.f,GFX[*icon].Sprite()->Size()/2,iconScale,tint); - } } }; \ No newline at end of file diff --git a/Adventures in Lestoria/Version.h b/Adventures in Lestoria/Version.h index 20fa9011..7f5d451d 100644 --- a/Adventures in Lestoria/Version.h +++ b/Adventures in Lestoria/Version.h @@ -39,7 +39,7 @@ All rights reserved. #define VERSION_MAJOR 1 #define VERSION_MINOR 3 #define VERSION_PATCH 0 -#define VERSION_BUILD 13901 +#define VERSION_BUILD 13902 #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 b916c63a..264412ba 100644 Binary files a/x64/Release/Adventures in Lestoria.exe and b/x64/Release/Adventures in Lestoria.exe differ