trigger_gravity: use .active instead of .state, remove magic numbers

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

diff --git a/qcsrc/common/triggers/subs.qh b/qcsrc/common/triggers/subs.qh
index 04b9ecd0d3782132dfcb837ae96193b0b1e5f75e..d8d926c80dd51b296990a77cf2a675817e526b72 100644 (file)
--- a/qcsrc/common/triggers/subs.qh
+++ b/qcsrc/common/triggers/subs.qh
@@ -1,4 +1,5 @@
 #pragma once
+#include "states.qh"
 
 void SUB_SetFade (entity ent, float when, float fading_time);
 void SUB_VanishOrRemove (entity ent);
@@ -41,6 +42,8 @@ void SUB_VanishOrRemove (entity ent);
 
 .vector dest1, dest2;
 
+.entity move_controller;
+
 #ifdef CSQC
 // this stuff is defined in the server side engine VM, so we must define it separately here
 .float takedamage;
@@ -48,11 +51,6 @@ const int DAMAGE_NO = 0;
 const int DAMAGE_YES = 1;
 const int DAMAGE_AIM = 2;
 
-const int STATE_TOP = 0;
-const int STATE_BOTTOM = 1;
-const int STATE_UP = 2;
-const int STATE_DOWN = 3;
-
 .string                noise, noise1, noise2, noise3;  // contains names of wavs to play
 
 .float         max_health;             // players maximum health is stored here