Add 'If locked, play locked sound on use' for doors

Author: FreeSlave

dlls/doors.cpp

@@ -69,7 +69,7 @@ class CBaseDoor : public CBaseToggle
 	void EXPORT DoorTouch( CBaseEntity *pOther );
 
 	// local functions
-	int DoorActivate();
+	int DoorActivate(bool activatedByUse = false);
 	void EXPORT DoorGoUp( void );
 	void EXPORT DoorGoDown( void );
 	void EXPORT DoorHitTop( void );
@@ -109,6 +109,7 @@ class CBaseDoor : public CBaseToggle
 
 	float m_returnSpeed;
 	bool m_ignoreCorpses;
+	bool m_playLockedSoundOnUse;
 	short m_blockerRecheck;
 
 	float SoundAttenuation() const
@@ -155,6 +156,7 @@ TYPEDESCRIPTION	CBaseDoor::m_SaveData[] =
 
 	DEFINE_FIELD( CBaseDoor, m_returnSpeed, FIELD_FLOAT ),
 	DEFINE_FIELD( CBaseDoor, m_ignoreCorpses, FIELD_BOOLEAN ),
+	DEFINE_FIELD( CBaseDoor, m_playLockedSoundOnUse, FIELD_BOOLEAN ),
 	DEFINE_FIELD( CBaseDoor, m_blockerRecheck, FIELD_SHORT ),
 };
 
@@ -390,6 +392,11 @@ void CBaseDoor::KeyValue( KeyValueData *pkvd )
 		m_ignoreCorpses = atoi(pkvd->szValue) != 0;
 		pkvd->fHandled = true;
 	}
+	else if ( FStrEq(pkvd->szKeyName, "locked_play_on_use") )
+	{
+		m_playLockedSoundOnUse = atoi(pkvd->szValue) != 0;
+		pkvd->fHandled = true;
+	}
 	else if ( FStrEq(pkvd->szKeyName, "blocker_recheck") )
 	{
 		m_blockerRecheck = (short)atoi(pkvd->szValue);
@@ -785,7 +792,7 @@ void CBaseDoor::Use( CBaseEntity *pActivator, CBaseEntity *pCaller, USE_TYPE use
 	}
 
 	if( shouldActivate )
-		DoorActivate();
+		DoorActivate(true);
 }
 
 float CBaseDoor::InputByMonster(CBaseMonster *pMonster)
@@ -850,10 +857,16 @@ NODE_LINKENT CBaseDoor::HandleLinkEnt(int afCapMask, bool nodeQueryStatic)
 //
 // Causes the door to "do its thing", i.e. start moving, and cascade activation.
 //
-int CBaseDoor::DoorActivate()
+int CBaseDoor::DoorActivate(bool activatedByUse)
 {
 	if( !UTIL_IsMasterTriggered( m_sMaster, m_hActivator ) )
+	{
+		if (activatedByUse && m_playLockedSoundOnUse)
+		{
+			PlayLockSounds( pev, &m_ls, true, false );
+		}
 		return 0;
+	}
 
 	if( FBitSet( pev->spawnflags, SF_DOOR_NO_AUTO_RETURN ) && (m_toggle_state == TS_AT_TOP || (m_iObeyTriggerMode == 2 && m_toggle_state == TS_GOING_UP)) )
 	{

fgd/halflife.fgd

@@ -903,6 +903,11 @@
 		0 : "Collide with corpses"
 		1 : "Don't collide with corpses"
 	]
+	locked_play_on_use(choices) : "If locked, play locked sound on use" : : "By default if door is locked by a master and is set to 'Use only' or triggered by something it won't play the locked sound. Set this option to change the behavior" =
+	[
+		0 : "No"
+		1 : "Yes"
+	]
 	blocker_recheck(choices) : "Continue moving if blocker is crushed" =
 	[
 		0 : "Default (as globally configured)"
@@ -2750,9 +2755,9 @@
 	_minlight(string) : "Minimum light level"
 ]
 
-@SolidClass base(Door, ZHLT, EntityUsePolicy) = func_door : "Basic door" []
+@SolidClass base(Door, EntityUsePolicy, ZHLT) = func_door : "Basic door" []
 
-@SolidClass base(Door, ZHLT, EntityUsePolicy) = func_door_rotating : "Rotating door"
+@SolidClass base(Door, EntityUsePolicy, ZHLT) = func_door_rotating : "Rotating door"
 [
 	spawnflags(flags) =
 	[