vera/nuclide
4
0
Fork 0
Code Issues 32 Pull requests Projects Releases Packages Activity

trigger_auto: Respect the triggerstate entity key. trigger_teleport: Fix flag check for monsters.

Browse source
This commit is contained in:
Marco Cawthorne 2020-08-07 22:14:59 +02:00
parent 282d9dbe5b
commit c9094d86d9
2 changed files with 9 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/gs-entbase/server/trigger_auto.cpp
View file

@ -27,6 +27,7 @@ It will not survive round respawns, etc.
class trigger_auto:CBaseTrigger
{
int m_iTriggerState;
float m_flDelay;
void(void) trigger_auto;
@ -40,11 +41,10 @@ trigger_auto::Processing(void)
// This is weird, because ents may not be spawned yet.
// However, Half-Life doesn't care about this, either.
// So why should we?
CBaseTrigger::UseTargets_Delay(TRIG_TOGGLE, m_flDelay);
CBaseTrigger::UseTargets_Delay(m_iTriggerState, m_flDelay);
if (spawnflags & 1) {
dprint(sprintf("^2trigger_auto::^3think^7: %s triggerer removed self\n",
m_strTarget));
dprint(sprintf("^2trigger_auto::^3think^7: %s triggerer removed self\n", m_strTarget));
think = __NULL__;
}
}
@ -58,11 +58,16 @@ trigger_auto::Respawn(void)
void
trigger_auto::trigger_auto(void)
{
m_iTriggerState = TRIG_TOGGLE;
for (int i = 1; i < (tokenize(__fullspawndata) - 1); i += 2) {
switch (argv(i)) {
case "delay":
m_flDelay = stof(argv(i+1));
break;
case "triggerstate":
m_iTriggerState = stoi(argv(i+1));
break;
default:
break;
}

2
src/gs-entbase/server/trigger_teleport.cpp
View file

@ -42,7 +42,7 @@ trigger_teleport::touch(void)
return;
if (spawnflags & TRIGTELE_NOCLIENTS && other.flags & FL_CLIENT)
return;
if (spawnflags & TRIGTELE_MONSTERS && !(other.flags & FL_MONSTER))
if (!(spawnflags & TRIGTELE_MONSTERS) && other.flags & FL_MONSTER)
return;
if (other.health > 0 || other.solid == SOLID_SLIDEBOX) {