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

@@ -82,7 +82,11 @@ bool CBaseCombatCharacter::Weapon_CanSwitchTo( CBaseCombatWeapon *pWeapon )
return false;
}
#ifdef MAPBASE
if ( !pWeapon->HasAnyAmmo() && !GetAmmoCount( pWeapon->m_iPrimaryAmmoType ) && !pWeapon->HasSpawnFlags(SF_WEAPON_NO_AUTO_SWITCH_WHEN_EMPTY) )
#else
if ( !pWeapon->HasAnyAmmo() && !GetAmmoCount( pWeapon->m_iPrimaryAmmoType ) )
#endif
return false;
if ( !pWeapon->CanDeploy() )
@@ -208,6 +212,16 @@ void CBaseCombatCharacter::SetBloodColor( int nBloodColor )
m_bloodColor = nBloodColor;
}
#if defined(MAPBASE) && defined(GAME_DLL)
//-----------------------------------------------------------------------------
// Purpose: Sets blood color
//-----------------------------------------------------------------------------
void CBaseCombatCharacter::InputSetBloodColor( inputdata_t &inputdata )
{
SetBloodColor(inputdata.value.Int());
}
#endif
//-----------------------------------------------------------------------------
/**
The main visibility check. Checks all the entity specific reasons that could