tech
/
nuclide
2
0
Fork 0
Code Issues 33 Releases Activity

Compare commits

base: tech:06d959ef020ab9ab9ee250ef3984998de15b2389
Branches Tags
tech:master
tech:Develop
tech:Documentation
...
compare: tech:9e68e24d2e706d9fadbb8c48a391f7d9d347ba6e
Branches Tags
tech:Develop
tech:master
tech:Documentation

2 Commits
06d959ef02 ... 9e68e24d2e

Author SHA1 Message Date
Marco Cawthorne 9e68e24d2e
trigger_teleport: Add filter for func_pushable entities. Test chamber can now be triggered. 2024-02-15 13:35:42 -08:00
Marco Cawthorne 99f513efdb
func_pushable: Remove hitcontentsmaski override, else the cart won't move up in the test chamber. 2024-02-15 13:35:13 -08:00
2 changed files with 5 additions and 2 deletions
Show Stats Expand all files Collapse all files

2
src/gs-entbase/server/func_pushable.qc
View File

@ -93,7 +93,7 @@ func_pushable::Respawn(void)
SetOrigin(GetSpawnOrigin());
SetMovetype(MOVETYPE_STEP);
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) {
m_eCollBox = spawn();

5
src/gs-entbase/server/trigger_teleport.qc
View File

@ -17,7 +17,8 @@
enumflags
{
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
@ -164,6 +165,8 @@ trigger_teleport::CanPass(NSEntity target)
return false;
if (!HasSpawnFlags(TRIGTELE_MONSTERS) && target.flags & FL_MONSTER)
return false;
if (!HasSpawnFlags(TRIGTELE_PUSHABLES) && target.classname == "func_pushable")
return false;
} else {
if (CanBeTriggeredBy(target) == false)
return false;