Merge branch 'master' into Lyberta/StandaloneOverkillWeapons

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / func / door.qh

diff --git a/qcsrc/common/triggers/func/door.qh b/qcsrc/common/triggers/func/door.qh
index e91061f14ce06950362a9003547a6744baeb7776..181de8b7b829592dc0ce3dcaf426524a824d78d2 100644 (file)
--- a/qcsrc/common/triggers/func/door.qh
+++ b/qcsrc/common/triggers/func/door.qh
@@ -1,17 +1,18 @@
-// door constants
-const int DOOR_START_OPEN = 1;
-const int DOOR_DONT_LINK = 4;
-const int DOOR_TOGGLE = 32;
+#pragma once
 
-const int DOOR_NOSPLASH = 256; // generic anti-splashdamage spawnflag
 
-const int SPAWNFLAGS_GOLD_KEY = 8;
-const int SPAWNFLAGS_SILVER_KEY = 16;
+const int DOOR_START_OPEN = BIT(0);
+const int DOOR_DONT_LINK = BIT(2);
+const int SPAWNFLAGS_GOLD_KEY = BIT(3); // Quake 1 compat, can only be used with func_door!
+const int SPAWNFLAGS_SILVER_KEY = BIT(4); // Quake 1 compat, can only be used with func_door!
+const int DOOR_TOGGLE = BIT(5);
+
+const int DOOR_NONSOLID = BIT(10);
+const int DOOR_CRUSH = BIT(11); // can't use CRUSH cause that is the same as DOOR_DONT_LINK
+
 
 #ifdef CSQC
 // stuff for preload
-void ent_door();
 
-// abused
-.float attack_finished_single;
+.float door_finished;
 #endif