Initial Mapbase commit (squashed from mapbase-beta)

This commit is contained in:
Blixibon
2019-08-31 19:28:20 +00:00
parent 0d8dceea43
commit 3d464bc051
816 changed files with 105527 additions and 957 deletions

View File

@@ -58,6 +58,9 @@ END_DATADESC()
#define SF_FADE_MODULATE 0x0002 // Modulate, don't blend
#define SF_FADE_ONLYONE 0x0004
#define SF_FADE_STAYOUT 0x0008
#ifdef MAPBASE
#define SF_FADE_DONT_PURGE 0x0016
#endif
//-----------------------------------------------------------------------------
// Purpose:
@@ -93,6 +96,13 @@ void CEnvFade::InputFade( inputdata_t &inputdata )
fadeFlags |= FFADE_STAYOUT;
}
#ifdef MAPBASE
if ( !HasSpawnFlags(SF_FADE_DONT_PURGE) )
{
fadeFlags |= FFADE_PURGE;
}
#endif
if ( m_spawnflags & SF_FADE_ONLYONE )
{
if ( inputdata.pActivator && inputdata.pActivator->IsNetClient() )
@@ -102,7 +112,11 @@ void CEnvFade::InputFade( inputdata_t &inputdata )
}
else
{
#ifdef MAPBASE
UTIL_ScreenFadeAll( m_clrRender, Duration(), HoldTime(), fadeFlags );
#else
UTIL_ScreenFadeAll( m_clrRender, Duration(), HoldTime(), fadeFlags|FFADE_PURGE );
#endif
}
m_OnBeginFade.FireOutput( inputdata.pActivator, this );