Compare commits

...

2 Commits

2 changed files with 5 additions and 2 deletions

View File

@ -93,7 +93,7 @@ func_pushable::Respawn(void)
SetOrigin(GetSpawnOrigin()); SetOrigin(GetSpawnOrigin());
SetMovetype(MOVETYPE_STEP); SetMovetype(MOVETYPE_STEP);
PlayerUse = OnPlayerUse; PlayerUse = OnPlayerUse;
hitcontentsmaski = CONTENTBIT_BODY; /* don't collide with anything but players */ //hitcontentsmaski = CONTENTBIT_BODY | CONTENTBIT_BODY; /* don't collide with anything but players */
if (!m_eCollBox) { if (!m_eCollBox) {
m_eCollBox = spawn(); m_eCollBox = spawn();

View File

@ -17,7 +17,8 @@
enumflags enumflags
{ {
TRIGTELE_MONSTERS, TRIGTELE_MONSTERS,
TRIGTELE_NOCLIENTS TRIGTELE_NOCLIENTS,
TRIGTELE_PUSHABLES
}; };
/*!QUAKED trigger_teleport (.5 .5 .5) ? CLIENTS NPCS PUSHABLES PHYSICS FRIENDLIES CLIENTSINVEHICLES EVERYTHING x x CLIENTSNOTINVEHICLES DEBRIS NPCSINVEHICLES NOBOTS /*!QUAKED trigger_teleport (.5 .5 .5) ? CLIENTS NPCS PUSHABLES PHYSICS FRIENDLIES CLIENTSINVEHICLES EVERYTHING x x CLIENTSNOTINVEHICLES DEBRIS NPCSINVEHICLES NOBOTS
@ -164,6 +165,8 @@ trigger_teleport::CanPass(NSEntity target)
return false; return false;
if (!HasSpawnFlags(TRIGTELE_MONSTERS) && target.flags & FL_MONSTER) if (!HasSpawnFlags(TRIGTELE_MONSTERS) && target.flags & FL_MONSTER)
return false; return false;
if (!HasSpawnFlags(TRIGTELE_PUSHABLES) && target.classname == "func_pushable")
return false;
} else { } else {
if (CanBeTriggeredBy(target) == false) if (CanBeTriggeredBy(target) == false)
return false; return false;