Skip to content

[TF2] Spelled cosmetics changing colors in backpack. #1558

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+47 −13
Open

[TF2] Spelled cosmetics changing colors in backpack. #1558

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 42 additions & 12 deletions src/game/client/econ/item_model_panel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3147,14 +3147,9 @@ void CItemModelPanel::UpdatePanels( void )
int iRGB0 = m_ItemData.GetModifiedRGBValue( false ),
iRGB1 = m_ItemData.GetModifiedRGBValue( true );

if ( !bIsEconTool && (iRGB0 != 0 || iRGB1 != 0))
if ( !bIsEconTool )
{
m_pPaintIcon->SetVisible( true );
m_pPaintIcon->m_colPaintColors.AddToTail( Color( clamp( (iRGB0 & 0xFF0000) >> 16, 0, 255 ), clamp( (iRGB0 & 0xFF00) >> 8, 0, 255 ), clamp( (iRGB0 & 0xFF), 0, 255 ), 255 ) );
if ( iRGB0 != iRGB1 )
{
m_pPaintIcon->m_colPaintColors.AddToTail( Color( clamp( (iRGB1 & 0xFF0000) >> 16, 0, 255 ), clamp( (iRGB1 & 0xFF00) >> 8, 0, 255 ), clamp( (iRGB1 & 0xFF), 0, 255 ), 255 ) );
}
DrawPaintImage(iRGB0, iRGB1);
}
}
}
Expand Down Expand Up @@ -3409,18 +3404,53 @@ void CItemModelPanel::SetModelIsHidden( bool bHideModel )
}
}

void CItemModelPanel::DrawPaintImage(int iRGB0, int iRGB1)
{
if (iRGB0 != 0 || iRGB1 != 0)
{
m_pPaintIcon->SetVisible(true);
m_pPaintIcon->m_colPaintColors.AddToTail(Color(clamp((iRGB0 & 0xFF0000) >> 16, 0, 255), clamp((iRGB0 & 0xFF00) >> 8, 0, 255), clamp((iRGB0 & 0xFF), 0, 255), 255));
if (iRGB0 != iRGB1)
{
m_pPaintIcon->m_colPaintColors.AddToTail(Color(clamp((iRGB1 & 0xFF0000) >> 16, 0, 255), clamp((iRGB1 & 0xFF00) >> 8, 0, 255), clamp((iRGB1 & 0xFF), 0, 255), 255));
}
}
}

static CSchemaAttributeDefHandle pAttrDef_SpellColor("SPELL: set item tint RGB");

void CItemModelPanel::OnTick()
{
bool bStillWorking = LoadData();
if ( m_pContainedItemPanel )
if ( m_pContainedItemPanel && bLoadingData)
{
bStillWorking |= m_pContainedItemPanel->LoadData();
}

// If we're done working, we dont need to tick anymore
if ( !bStillWorking )
// If we're done working, lets check if the item is spelled and can change colors!
// If it is not, lets stop ticking the panel and act like normal.
if (!bStillWorking)
{
LoadDataCompleted();
bLoadingData = false;
if (!pAttrDef_SpellColor || !m_ItemData.FindAttribute(pAttrDef_SpellColor))
{
RemovePanelTick();
}
else if (m_pPaintIcon)
{
if (!m_bHideModel && !m_bHidePaintIcon)
{
// Empty out our list of paint colors. We may or may not put things back in -- an empty
// list at the end means "don't draw the paint icon".
m_pPaintIcon->m_colPaintColors.RemoveAll();

// Has the item been painted?
int iRGB0 = m_ItemData.GetModifiedRGBValue(false),
iRGB1 = m_ItemData.GetModifiedRGBValue(true);

DrawPaintImage(iRGB0, iRGB1);
}
}
}

BaseClass::OnTick();
Expand Down Expand Up @@ -3529,7 +3559,7 @@ bool CItemModelPanel::LoadData()
return bStillWorking;
}

void CItemModelPanel::LoadDataCompleted()
void CItemModelPanel::RemovePanelTick()
{
vgui::ivgui()->RemoveTickSignal( GetVPanel() );
}
Expand Down
6 changes: 5 additions & 1 deletion src/game/client/econ/item_model_panel.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ class CItemModelPanel : public vgui::EditablePanel
virtual void OnTick() OVERRIDE;
void SetNeedsToLoad();
bool LoadData();
void LoadDataCompleted();
void RemovePanelTick();

CExLabel *GetNameLabel( void ) { return m_pItemNameLabel; }

Expand Down Expand Up @@ -290,6 +290,10 @@ class CItemModelPanel : public vgui::EditablePanel
void UpdateEquippedLabel( void );
void CleanupNoItemWChars( void );

bool bLoadingData = true;

void DrawPaintImage(int iRGB0, int iRGB1);

bool UpdateSeriesLabel();
bool UpdateMatchesLabel();
bool UpdateQuantityLabel();
Expand Down