Get skin family & skinref count from texture header

Resolves SamVanheer#57
RauliTop · Apr 5, 2019 · eb6d1c8 · eb6d1c8
1 parent b81092e
commit eb6d1c8
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/src/game/entity/CStudioModelEntity.cpp b/src/game/entity/CStudioModelEntity.cpp
@@ -294,7 +294,7 @@ int CStudioModelEntity::SetSkin( const int iSkin )
 	if( !m_pModel )
 		return 0;
 
-	if( iSkin < m_pModel->GetStudioHeader()->numskinfamilies )
+	if( iSkin < m_pModel->GetTextureHeader()->numskinfamilies )
 	{
 		m_iSkin = iSkin;
 	}

diff --git a/src/tools/hlmv/CHLMVState.cpp b/src/tools/hlmv/CHLMVState.cpp
@@ -172,6 +172,7 @@ bool CHLMVState::DumpModelInfo( const char* const pszFilename )
 		const auto pModel = m_pEntity->GetModel();
 
 		const studiohdr_t* const pHdr = pModel->GetStudioHeader();
+		const auto pTextureHdr = pModel->GetTextureHeader();
 
 		const byte* const pByte = reinterpret_cast<const byte* const>( pHdr );
 
@@ -375,8 +376,8 @@ bool CHLMVState::DumpModelInfo( const char* const pszFilename )
 		fprintf( pFile,
 				 "Number of Skin References: %d\n"
 				 "Number of Skin Families: %d\n\n",
-				 pHdr->numskinref,
-				 pHdr->numskinfamilies
+			pTextureHdr->numskinref,
+			pTextureHdr->numskinfamilies
 		);
 
 		fprintf( pFile,

diff --git a/src/tools/hlmv/ui/controlpanels/CBodyPartsPanel.cpp b/src/tools/hlmv/ui/controlpanels/CBodyPartsPanel.cpp
@@ -112,8 +112,9 @@ void CBodyPartsPanel::InitializeUI()
 		auto pModel = pEntity->GetModel();
 
 		const studiohdr_t* const pHdr = pModel->GetStudioHeader();
+		const auto pTextureHdr = pModel->GetTextureHeader();
 
-		if( pHdr )
+		if( pHdr && pTextureHdr )
 		{
 			const mstudiobodyparts_t* const pbodyparts = ( mstudiobodyparts_t* ) ( ( byte* ) pHdr + pHdr->bodypartindex );
 
@@ -140,9 +141,9 @@ void CBodyPartsPanel::InitializeUI()
 				m_pSubmodel->Enable( false );
 			}
 
-			m_pSkin->Enable( pHdr->numskinfamilies > 0 );
+			m_pSkin->Enable( pTextureHdr->numskinfamilies > 0 );
 
-			for( int i = 0; i < pHdr->numskinfamilies; ++i )
+			for( int i = 0; i < pTextureHdr->numskinfamilies; ++i )
 			{
 				names.Add( wxString::Format( "Skin %d", i + 1 ) );
 			}
@@ -317,7 +318,7 @@ void CBodyPartsPanel::SetModelInfo( const studiohdr_t& hdr, const studiohdr_t& t
 	m_pSequenceGroups	->SetLabelText( wxString::Format( "Sequence Groups: %d", hdr.numseqgroups ) );
 
 	m_pTextures			->SetLabelText( wxString::Format( "Textures: %d", texHdr.numtextures ) );
-	m_pSkinFamilies		->SetLabelText( wxString::Format( "Skin Families: %d", hdr.numskinfamilies ) );
+	m_pSkinFamilies		->SetLabelText( wxString::Format( "Skin Families: %d", texHdr.numskinfamilies ) );
 	m_pBodyparts		->SetLabelText( wxString::Format( "Bodyparts: %d", hdr.numbodyparts ) );
 	m_pAttachments		->SetLabelText( wxString::Format( "Attachments: %d", hdr.numattachments ) );
 	m_pTransitions		->SetLabelText( wxString::Format( "Transitions: %d", hdr.numtransitions ) );