Skip to content

Commit 1cb97b1

Browse files
committed
xrGame/UIProgressBar.h: Removed m_bNoLerp. This variable wasn't needed.
1 parent 496a8f1 commit 1cb97b1

File tree

4 files changed

+3
-12
lines changed

4 files changed

+3
-12
lines changed

src/xrGame/ui/UIActorMenu.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,7 @@ class CUIActorMenu : public CUIDialogWnd, public CUIWndCallback
228228
EDDListType GetListType(CUIDragDropListEx* l);
229229

230230
public:
231-
CUIDragDropListEx* GetListByType(EDDListType t); //Alundaio: Make public
231+
CUIDragDropListEx* GetListByType(EDDListType t); //Alundaio: Made public
232232

233233
protected:
234234
CUIDragDropListEx* GetSlotList(u16 slot_idx);

src/xrGame/ui/UICellItem.cpp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -228,7 +228,6 @@ void CUICellItem::UpdateConditionProgressBar()
228228
else
229229
cond = (float)remaining_uses * 0.125f - 0.0625f;
230230

231-
m_pConditionState->m_bNoLerp = true;
232231
m_pConditionState->m_bUseGradient = false;
233232
}
234233
}

src/xrGame/ui/UIProgressBar.cpp

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ CUIProgressBar::CUIProgressBar(void)
1111
m_bBackgroundPresent = false;
1212
m_bUseColor = false;
1313
m_bUseGradient = true;
14-
m_bNoLerp = false; //Alundaio
1514

1615
AttachChild(&m_UIBackgroundItem);
1716
AttachChild(&m_UIProgressItem);
@@ -55,20 +54,14 @@ void CUIProgressBar::UpdateProgressBar()
5554

5655
if (m_bUseColor)
5756
{
58-
if (m_bNoLerp)
59-
{
60-
m_UIProgressItem.SetTextureColor(m_maxColor.get());
61-
return;
62-
}
63-
6457
if ( m_bUseGradient )
6558
{
6659
Fcolor curr;
6760
curr.lerp(m_minColor, m_middleColor, m_maxColor, fCurrentLength);
6861
m_UIProgressItem.SetTextureColor(curr.get());
6962
}
7063
else
71-
m_UIProgressItem.SetTextureColor( m_maxColor.get());
64+
m_UIProgressItem.SetTextureColor(m_maxColor.get());
7265
}
7366
}
7467

src/xrGame/ui/UIProgressBar.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ class CUIProgressBar : public CUIWindow
3232

3333
public:
3434
bool m_bUseColor;
35-
bool m_bUseGradient;
36-
bool m_bNoLerp; //Alundaio: use only solid color with m_maxColor
35+
bool m_bUseGradient; //Alundaio: if false then use only solid color with m_maxColor
3736
Fcolor m_minColor;
3837
Fcolor m_middleColor;
3938
Fcolor m_maxColor;

0 commit comments

Comments
 (0)