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

Fixed conflict between min/max macros and std::min/max when using GCC >= 4.2.

Browse Source
This commit is contained in:
Scott Ehlert
2011-04-28 01:29:22 -05:00
parent 88dd2ac536
commit 7f4855ae1f
265 changed files with 904 additions and 945 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
public/studio_virtualmodel.cpp
View File

@ -455,8 +455,8 @@ void virtualmodel_t::AppendPoseParameters( int group, const studiohdr_t *pStudio
// duplicate, reset start and end to fit full dynamic range
mstudioposeparamdesc_t *pPose1 = pStudioHdr->pLocalPoseParameter( j );
mstudioposeparamdesc_t *pPose2 = m_group[ pose[k].group ].GetStudioHdr()->pLocalPoseParameter( pose[k].index );
float start = min( pPose2->end, min( pPose1->end, min( pPose2->start, pPose1->start ) ) );
float end = max( pPose2->end, max( pPose1->end, max( pPose2->start, pPose1->start ) ) );
float start = MIN( pPose2->end, MIN( pPose1->end, MIN( pPose2->start, pPose1->start ) ) );
float end = MAX( pPose2->end, MAX( pPose1->end, MAX( pPose2->start, pPose1->start ) ) );
pPose2->start = start;
pPose2->end = end;
}