Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-19 12:06:07 +08:00
Code Activity

Modified SDK for GCC 4.2

Browse Source
This commit is contained in:
Scott Ehlert
2008-09-15 02:50:57 -05:00
parent 86f3bc8a60
commit 7ff7f366d5
696 changed files with 23423 additions and 22634 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
public/studio.cpp
View File

@ -516,7 +516,7 @@ void studiohdr_t::SetAttachmentBone( int iAttachment, int iBone )
// Purpose:
//-----------------------------------------------------------------------------
char *studiohdr_t::pszNodeName( int iNode ) const
const char *studiohdr_t::pszNodeName( int iNode ) const
{
if (numincludemodels == 0)
{
@ -799,7 +799,9 @@ const virtualmodel_t * CStudioHdr::ResetVModel( const virtualmodel_t *pVModel )
if (pVModel != NULL)
{
m_pVModel = (virtualmodel_t *)pVModel;
#if defined(_WIN32) && !defined(THREAD_PROFILER)
Assert( !pVModel->m_Lock.GetOwnerId() );
#endif
m_pStudioHdrCache.SetCount( m_pVModel->m_group.Count() );
int i;
@ -847,7 +849,9 @@ const studiohdr_t *CStudioHdr::GroupStudioHdr( int i ) const
if (pStudioHdr == NULL)
{
#if defined(_WIN32) && !defined(THREAD_PROFILER)
Assert( !m_pVModel->m_Lock.GetOwnerId() );
#endif
virtualgroup_t *pGroup = &m_pVModel->m_group[ i ];
pStudioHdr = pGroup->GetStudioHdr();
m_pStudioHdrCache[ i ] = pStudioHdr;
@ -1149,7 +1153,7 @@ void CStudioHdr::SetAttachmentBone( int iAttachment, int iBone )
// Purpose:
//-----------------------------------------------------------------------------
char *CStudioHdr::pszNodeName( int iNode ) const
const char *CStudioHdr::pszNodeName( int iNode ) const
{
if (m_pVModel == NULL)
{
@ -1816,4 +1820,4 @@ void CStudioHdr::CActivityToSequenceMapping::SetValidationPair( const CStudioHdr
{
m_expectedPStudioHdr = pstudiohdr->GetRenderHdr();
m_expectedVModel = pstudiohdr->GetVirtualModel();
}
}