Backups/hl2sdk
1
0 Fork 0
mirror of https://github.com/alliedmodders/hl2sdk.git synced 2026-10-11 04:28:00 +08:00
Code Issues Packages Projects Releases Wiki 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 committed 2011-04-28 01:30:37 -05:00
1 parent 6c38e2e589
commit 4caefcbcba
300 files changed
+1041 -1084
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

game/shared/sequence_Transitioner.cpp
+1 -1
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) )