Correct Issue #136. Release Build 13902.
This commit is contained in:
parent
4a99cc7eb6
commit
05d797a785
@ -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);
|
||||
}
|
||||
};
|
||||
@ -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);
|
||||
}
|
||||
}
|
||||
};
|
||||
@ -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
|
||||
|
||||
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user