From: Freddy Date: Mon, 5 Mar 2018 14:37:00 +0000 (+0100) Subject: Don't use PLAT_CRUSH for doors (same as DOOR_DONT_LINK) X-Git-Tag: xonotic-v0.8.5~2176^2~46 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a06305005a45886ed0b07a9c5bd50577d1dedff7;p=xonotic%2Fxonotic-data.pk3dir.git Don't use PLAT_CRUSH for doors (same as DOOR_DONT_LINK) --- diff --git a/qcsrc/common/triggers/func/door.qc b/qcsrc/common/triggers/func/door.qc index 21ee89b7b..731cacb33 100644 --- a/qcsrc/common/triggers/func/door.qc +++ b/qcsrc/common/triggers/func/door.qc @@ -27,7 +27,7 @@ void door_go_up(entity this, entity actor, entity trigger); void door_blocked(entity this, entity blocker) { - if((this.spawnflags & PLAT_CRUSH) + if((this.spawnflags & DOOR_CRUSH) #ifdef SVQC && (blocker.takedamage != DAMAGE_NO) #elif defined(CSQC) @@ -314,7 +314,7 @@ void door_touch(entity this, entity toucher) void door_generic_plat_blocked(entity this, entity blocker) { - if((this.spawnflags & PLAT_CRUSH) && (blocker.takedamage != DAMAGE_NO)) { // Kill Kill Kill!! + if((this.spawnflags & DOOR_CRUSH) && (blocker.takedamage != DAMAGE_NO)) { // Kill Kill Kill!! #ifdef SVQC Damage (blocker, this, this, 10000, DEATH_HURTTRIGGER.m_id, DMG_NOWEP, blocker.origin, '0 0 0'); #endif diff --git a/qcsrc/common/triggers/func/door.qh b/qcsrc/common/triggers/func/door.qh index 93a3eee51..23ba20df1 100644 --- a/qcsrc/common/triggers/func/door.qh +++ b/qcsrc/common/triggers/func/door.qh @@ -8,6 +8,7 @@ const int DOOR_TOGGLE = BIT(5); const int DOOR_NOSPLASH = BIT(8); // generic anti-splashdamage spawnflag const int DOOR_NONSOLID = BIT(10); +const int DOOR_CRUSH = BIT(11); // can't use PLAT_CRUSH cause that is the same as DOOR_DONT_LINK const int SPAWNFLAGS_GOLD_KEY = BIT(3); const int SPAWNFLAGS_SILVER_KEY = BIT(4);