Merge branch 'master' into Mario/fullbright_skins

[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 19ccde9dca08ec764fa86fd5a0a788e915642d36..1ce3ea2e9e842864e7315270fab82622a784af81 100644 (file)
--- a/qcsrc/common/triggers/subs.qh
+++ b/qcsrc/common/triggers/subs.qh
@@ -9,7 +9,8 @@
        #define SUB_ORIGIN                      origin
        #define SUB_SETORIGIN(s,v)      setorigin((s), (v))
        #define SUB_NEXTTHINK           nextthink
-       #define SUB_THINK                       think
+       #define SUB_THINK(e, f)     setthink(e, f)
+       #define SUB_THUNK(e)        getthink(e)
        #define SUB_LTIME                       ltime
        #define SUB_FLAGS                       flags
 
@@ -22,25 +23,27 @@
        #define SUB_AVELOCITY   move_avelocity
        #define SUB_ORIGIN              move_origin
        #define SUB_NEXTTHINK   move_nextthink
-       #define SUB_THINK               move_think
+       #define SUB_THINK(e, f) ((e).move_think = (f))
+       #define SUB_THUNK(e)    ((e).move_think)
        #define SUB_LTIME               move_ltime
        #define SUB_FLAGS               move_flags
 
 .vector move_origin;
 
        void SUB_SETORIGIN(entity s, vector v)
-       {SELFPARAM();
+       {
                s.move_origin = v;
                _Movetype_LinkEdict(s, true);
        }
 
 #endif
 
+
 void SUB_SetFade (entity ent, float when, float fading_time);
 void SUB_VanishOrRemove (entity ent);
 
 .vector                finaldest, finalangle;          //plat.qc stuff
-.void()                think1;
+.void(entity this) think1;
 .float state;
 .float         t_length, t_width;
 
@@ -55,7 +58,7 @@ void SUB_VanishOrRemove (entity ent);
 .string  platmovetype;
 .float platmovetype_start, platmovetype_end;
 
-entity activator;
+//entity activator;
 
 .string killtarget;