ambient_generic: Add support for most Source Engine input triggers. Also fix a minor mistake in the QUAKED comment for level editors.
This commit is contained in:
parent
aed306cbd1
commit
039d9937e9
1 changed files with 41 additions and 24 deletions
|
@ -43,8 +43,8 @@ Plays a sound sample of whatever format the engine is configured to support.
|
||||||
- "target" : Target when triggered.
|
- "target" : Target when triggered.
|
||||||
- "killtarget" : Target to kill when triggered.
|
- "killtarget" : Target to kill when triggered.
|
||||||
- "message" : Sound file to play, or sentences.txt entry if prefixed with a '!'
|
- "message" : Sound file to play, or sentences.txt entry if prefixed with a '!'
|
||||||
- "volume" : Playback volume from 0.0 to 1.0
|
- "volume" : Playback volume from 0.0 to 1.0 (default)
|
||||||
- "pitch" : Playback pitch from 0.0 to 2.0
|
- "pitch" : Playback pitch, default is 100.
|
||||||
|
|
||||||
# SPAWNFLAGS
|
# SPAWNFLAGS
|
||||||
- AS_ARADIUS (1) : Plays the sound everywhere. Heard by everyone.
|
- AS_ARADIUS (1) : Plays the sound everywhere. Heard by everyone.
|
||||||
|
@ -76,6 +76,7 @@ public:
|
||||||
virtual float SendEntity(entity,float);
|
virtual float SendEntity(entity,float);
|
||||||
virtual void UseNormal(entity,triggermode_t);
|
virtual void UseNormal(entity,triggermode_t);
|
||||||
virtual void UseLoop(entity, triggermode_t);
|
virtual void UseLoop(entity, triggermode_t);
|
||||||
|
virtual void Input(entity, string, string);
|
||||||
#else
|
#else
|
||||||
virtual void ReceiveEntity(float,float);
|
virtual void ReceiveEntity(float,float);
|
||||||
virtual float predraw(void);
|
virtual float predraw(void);
|
||||||
|
@ -178,7 +179,7 @@ ambient_generic::SpawnKey(string strKey, string strValue)
|
||||||
case "pitch":
|
case "pitch":
|
||||||
m_flSpawnPitch = stof(strValue);
|
m_flSpawnPitch = stof(strValue);
|
||||||
break;
|
break;
|
||||||
/* backwards compat */
|
/* backwards compat with GoldSrc/Source */
|
||||||
case "health":
|
case "health":
|
||||||
m_flSpawnVolume = stof(strValue) * 0.1f;
|
m_flSpawnVolume = stof(strValue) * 0.1f;
|
||||||
break;
|
break;
|
||||||
|
@ -281,7 +282,7 @@ ambient_generic::UseNormal(entity act, triggermode_t state)
|
||||||
void
|
void
|
||||||
ambient_generic::UseLoop(entity act, triggermode_t state)
|
ambient_generic::UseLoop(entity act, triggermode_t state)
|
||||||
{
|
{
|
||||||
if (m_bToggle == TRUE) {
|
if (m_bToggle == true) {
|
||||||
NSLog("^2ambient_generic::^3UseLoop^7: %s stops `%s`",
|
NSLog("^2ambient_generic::^3UseLoop^7: %s stops `%s`",
|
||||||
target, m_strActivePath);
|
target, m_strActivePath);
|
||||||
m_strActivePath = "common/null.wav";
|
m_strActivePath = "common/null.wav";
|
||||||
|
@ -291,31 +292,47 @@ ambient_generic::UseLoop(entity act, triggermode_t state)
|
||||||
target, m_strActivePath);
|
target, m_strActivePath);
|
||||||
}
|
}
|
||||||
|
|
||||||
m_bToggle = 1 - m_bToggle;
|
m_bToggle = !m_bToggle;
|
||||||
|
}
|
||||||
|
|
||||||
|
void
|
||||||
|
ambient_generic::Input(entity eAct, string strKey, string strValue)
|
||||||
|
{
|
||||||
|
switch (strKey) {
|
||||||
|
case "Pitch":
|
||||||
|
m_flPitch = stof(strValue);
|
||||||
|
break;
|
||||||
|
case "PlaySound":
|
||||||
|
m_bToggle = false;
|
||||||
|
Trigger(eAct, TRIG_TOGGLE);
|
||||||
|
break;
|
||||||
|
case "StopSound":
|
||||||
|
m_bToggle = true;
|
||||||
|
Trigger(eAct, TRIG_TOGGLE);
|
||||||
|
break;
|
||||||
|
case "ToggleSound":
|
||||||
|
m_bToggle = !m_bToggle;
|
||||||
|
Trigger(eAct, TRIG_TOGGLE);
|
||||||
|
break;
|
||||||
|
case "Volume":
|
||||||
|
m_flVolume = stof(strValue) / 10;
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
super::Input(eAct, strKey, strValue);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
ambient_generic::EvaluateEntity(void)
|
ambient_generic::EvaluateEntity(void)
|
||||||
{
|
{
|
||||||
if (ATTR_CHANGED(origin))
|
EVALUATE_VECTOR(origin, 0, AMBIENT_ORIGIN)
|
||||||
SetSendFlags(AMBIENT_ORIGIN);
|
EVALUATE_VECTOR(origin, 1, AMBIENT_ORIGIN)
|
||||||
if (ATTR_CHANGED(m_strActivePath))
|
EVALUATE_VECTOR(origin, 2, AMBIENT_ORIGIN)
|
||||||
SetSendFlags(AMBIENT_PATH);
|
EVALUATE_FIELD(m_strActivePath, AMBIENT_PATH)
|
||||||
if (ATTR_CHANGED(m_flVolume))
|
EVALUATE_FIELD(m_flVolume, AMBIENT_VOLUME)
|
||||||
SetSendFlags(AMBIENT_VOLUME);
|
EVALUATE_FIELD(m_flRadius, AMBIENT_RADIUS)
|
||||||
if (ATTR_CHANGED(m_flRadius))
|
EVALUATE_FIELD(m_flPitch, AMBIENT_PITCH)
|
||||||
SetSendFlags(AMBIENT_RADIUS);
|
EVALUATE_FIELD(m_bLoops, AMBIENT_ENABLED)
|
||||||
if (ATTR_CHANGED(m_flPitch))
|
|
||||||
SetSendFlags(AMBIENT_PITCH);
|
|
||||||
if (ATTR_CHANGED(m_bLoops))
|
|
||||||
SetSendFlags(AMBIENT_ENABLED);
|
|
||||||
|
|
||||||
SAVE_STATE(origin)
|
|
||||||
SAVE_STATE(m_strActivePath)
|
|
||||||
SAVE_STATE(m_flVolume)
|
|
||||||
SAVE_STATE(m_flRadius)
|
|
||||||
SAVE_STATE(m_flPitch)
|
|
||||||
SAVE_STATE(m_bLoops)
|
|
||||||
}
|
}
|
||||||
|
|
||||||
float
|
float
|
||||||
|
|
Loading…
Reference in a new issue