Implement ValveSoftware#1558

Author: Bitl

game/quiver/info_changelog.txt

@@ -98,6 +98,8 @@ Added the following Source SDK Pull Requests:
 	- #1554: Add parameter for getpos/spec_pos to copy output to clipboard
 	- #1556: Fix unspawned support wavespawns not giving their money
 	- #1555: Sentry fixes for Exorcism spell
+	- #1558: Fix spelled cosmetics not changing colors in backpack.
+	- #1559: Fix Team Spirit Footprints BLU team coloring
 
 Details:
 - Fixed a bug where the mini-crit damage effect doesn't show up when your shield breaks.

src/game/client/econ/item_model_panel.cpp

@@ -3147,6 +3147,12 @@ void CItemModelPanel::UpdatePanels( void )
 			int iRGB0 = m_ItemData.GetModifiedRGBValue( false ),
 				iRGB1 = m_ItemData.GetModifiedRGBValue( true );
 
+#ifdef BDSBASE
+			if (!bIsEconTool)
+			{
+				DrawPaintImage(iRGB0, iRGB1);
+			}
+#else
 			if ( !bIsEconTool && (iRGB0 != 0 || iRGB1 != 0))
 			{
 				m_pPaintIcon->SetVisible( true );
@@ -3156,6 +3162,7 @@ void CItemModelPanel::UpdatePanels( void )
 					m_pPaintIcon->m_colPaintColors.AddToTail( Color( clamp( (iRGB1 & 0xFF0000) >> 16, 0, 255 ), clamp( (iRGB1 & 0xFF00) >> 8, 0, 255 ), clamp( (iRGB1 & 0xFF), 0, 255 ), 255 ) );
 				}
 			}
+#endif
 		}
 	}
 
@@ -3409,19 +3416,68 @@ void CItemModelPanel::SetModelIsHidden( bool bHideModel )
 	}
 }
 
+#ifdef BDSBASE
+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");
+#endif
+
 void CItemModelPanel::OnTick()
 {
 	bool bStillWorking = LoadData();
+#ifdef BDSBASE
+	if (m_pContainedItemPanel && bLoadingData)
+#else
 	if ( m_pContainedItemPanel )
+#endif
 	{
 		bStillWorking |= m_pContainedItemPanel->LoadData();
 	}
 
+#ifdef BDSBASE
+	// 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)
+	{
+		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);
+			}
+		}
+	}
+#else
 	// If we're done working, we dont need to tick anymore
 	if ( !bStillWorking )
 	{
 		LoadDataCompleted();
 	}
+#endif
 
 	BaseClass::OnTick();
 }
@@ -3529,7 +3585,11 @@ bool CItemModelPanel::LoadData()
 	return bStillWorking;
 }
 
+#ifdef BDSBASE
+void CItemModelPanel::RemovePanelTick()
+#else
 void CItemModelPanel::LoadDataCompleted()
+#endif
 {
 	vgui::ivgui()->RemoveTickSignal( GetVPanel() );
 }

src/game/client/econ/item_model_panel.h

@@ -224,7 +224,11 @@ class CItemModelPanel : public vgui::EditablePanel
 	virtual void OnTick() OVERRIDE;
 	void	SetNeedsToLoad();
 	bool	LoadData();
+#ifdef BDSBASE
+	void	RemovePanelTick();
+#else
 	void	LoadDataCompleted();
+#endif
 
 	CExLabel	*GetNameLabel( void ) { return m_pItemNameLabel; }
 
@@ -290,6 +294,11 @@ class CItemModelPanel : public vgui::EditablePanel
 	void	UpdateEquippedLabel( void );
 	void	CleanupNoItemWChars( void );
 
+#ifdef BDSBASE
+	bool	bLoadingData = true;
+	void	DrawPaintImage(int iRGB0, int iRGB1);
+#endif
+
 	bool	UpdateSeriesLabel();
 	bool	UpdateMatchesLabel();
 	bool	UpdateQuantityLabel();