Skip to content

[TF2] Fix Paintkit Tool Canvas preview not using the right material for Macaw-tinted War Paints #1856

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
Piogre wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[TF2] Fix Paintkit Tool Canvas preview not using the right material for Macaw-tinted War Paints #1856

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
16 changes: 15 additions & 1 deletion src/game/shared/econ/econ_paintkit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,15 @@ const char* CPaintKitDefinition::GetMaterialOverride( item_definition_index_t iD
}
}

//paintkit tool's iDefIndex will come in here as different for every different paint
//and is different from the index that comes up when generating the supported items below
//BUT if we're getting asked for the override for an item thats not in the supported items
//and the paint CAN render a paintkit tool, this is surely asking for the paintkit override
if (m_bHasPaintKitTool && m_pszPaintKitOverride && *m_pszPaintKitOverride)
{
return m_pszPaintKitOverride;
}

return NULL;
}

Expand All @@ -91,7 +100,8 @@ void CPaintKitDefinition::GenerateSupportedItems() const
CUtlVector< SupportedItem_t > tempVec;
const CMsgPaintKit_Definition *pPaintKitDef = static_cast< const CMsgPaintKit_Definition * >( GetMsg() );
bool bHasPaintKitTool = false;
auto lambdaGenerateSupportedItems = [ pPaintKitDef, &tempVec, &bHasPaintKitTool ]( const google::protobuf::Message* pMsgVar, const google::protobuf::FieldDescriptor* pField, const CMsgFieldID& fieldID )->bool
const char *pszPaintKitOverride = NULL;
auto lambdaGenerateSupportedItems = [ pPaintKitDef, &tempVec, &bHasPaintKitTool, &pszPaintKitOverride]( const google::protobuf::Message* pMsgVar, const google::protobuf::FieldDescriptor* pField, const CMsgFieldID& fieldID )->bool
{
if ( !BMessagesTypesAreTheSame( pMsgVar->GetDescriptor(), CMsgPaintKit_Definition_Item::descriptor() ) )
{
Expand All @@ -113,6 +123,7 @@ void CPaintKitDefinition::GenerateSupportedItems() const
if ( pItemDefMsg->item_definition_index() == pPaintkitToolItemDef->GetDefinitionIndex() )
{
bHasPaintKitTool = true;
pszPaintKitOverride = pItemMsg->data().material_override().c_str();
}
}

Expand Down Expand Up @@ -145,6 +156,9 @@ void CPaintKitDefinition::GenerateSupportedItems() const

m_vecSupportedItems.AddVectorToTail( tempVec );
m_bHasPaintKitTool = bHasPaintKitTool;
if (bHasPaintKitTool) {
m_pszPaintKitOverride = pszPaintKitOverride && *pszPaintKitOverride ? pszPaintKitOverride : NULL;
}
}
}

Expand Down
1 change: 1 addition & 0 deletions src/game/shared/econ/econ_paintkit.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,6 +90,7 @@ class CPaintKitDefinition : public CTypedProtoBufScriptObjectDefinition< CMsgPai
};
mutable CUtlVector< SupportedItem_t > m_vecSupportedItems;
mutable bool m_bHasPaintKitTool;
mutable const char* m_pszPaintKitOverride;
};

#ifdef CLIENT_DLL
Expand Down