Mapbase v4.0

- Fixed SDK_Refract and SDK_Water not using new cubemap method
- Added missing .inc files for SDK_ShatteredGlass
- Updated gitignore
- Fixed parallax corrected cubemaps sometimes causing VBSP to crash
- Added spawnflag to npc_headcrab which can prevent a headcrab from drowning
- Added spawnflag to npc_headcrab which can prevent a headcrab from instantly dying to a melee weapon
This commit is contained in:
Blixibon
2020-06-13 20:45:37 +00:00
parent af85131deb
commit a7e23e46e9
12 changed files with 1103 additions and 33 deletions

View File

@@ -72,6 +72,10 @@ ConVar g_debug_headcrab( "g_debug_headcrab", "0", FCVAR_CHEAT );
//------------------------------------
#define SF_HEADCRAB_START_HIDDEN (1 << 16)
#define SF_HEADCRAB_START_HANGING (1 << 17)
#ifdef MAPBASE
#define SF_HEADCRAB_DONT_DROWN (1 << 18)
#define SF_HEADCRAB_NO_MELEE_INSTAKILL (1 << 19)
#endif
//-----------------------------------------------------------------------------
@@ -1045,7 +1049,11 @@ void CBaseHeadcrab::GatherConditions( void )
BaseClass::GatherConditions();
#ifdef MAPBASE
if (GetWaterLevel() > 1 && m_lifeState == LIFE_ALIVE && !HasSpawnFlags( SF_HEADCRAB_DONT_DROWN ))
#else
if( m_lifeState == LIFE_ALIVE && GetWaterLevel() > 1 )
#endif
{
// Start Drowning!
SetCondition( COND_HEADCRAB_IN_WATER );
@@ -1725,7 +1733,12 @@ int CBaseHeadcrab::OnTakeDamage_Alive( const CTakeDamageInfo &inputInfo )
//
// Certain death from melee bludgeon weapons!
//
#ifdef MAPBASE
// (unless the mapper said no)
if ( info.GetDamageType() & DMG_CLUB && !HasSpawnFlags( SF_HEADCRAB_NO_MELEE_INSTAKILL ) )
#else
if ( info.GetDamageType() & DMG_CLUB )
#endif
{
info.SetDamage( m_iHealth );
}