Backups/hl2sdk
1
0
Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2025-09-20 12:36:05 +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:28:41 -05:00
parent afe9f41508
commit 14deb350cf
265 changed files with 904 additions and 947 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
game_shared/sequence_Transitioner.cpp
View File

@ -48,7 +48,7 @@ void CSequenceTransitioner::CheckForSequenceChange(
else
{
mstudioseqdesc_t &prevseqdesc = hdr->pSeqdesc( currentblend->m_nSequence );
currentblend->m_flLayerFadeOuttime = min( prevseqdesc.fadeouttime, seqdesc.fadeintime );
currentblend->m_flLayerFadeOuttime = MIN( prevseqdesc.fadeouttime, seqdesc.fadeintime );
/*
// clip blends to time remaining
if ( !IsSequenceLooping(hdr, currentblend->m_nSequence) )