X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Fsubs.qh;h=8d4e406504cf62eadd2458b01912eb938c5c51bc;hb=bc50c2d7ca3e0a44ed1712400ef8e170e6df8210;hp=e3b9c2e6963c5934506f804dc739f6a37be2e956;hpb=df665474154273d055a2489359282d4e0e053cd8;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/subs.qh b/qcsrc/common/triggers/subs.qh
index e3b9c2e69..8d4e40650 100644
--- a/qcsrc/common/triggers/subs.qh
+++ b/qcsrc/common/triggers/subs.qh
@@ -1,61 +1,17 @@
-#ifndef SUBS_H
-#define SUBS_H
-
-#ifdef SVQC
-
-	#define SUB_ANGLES(s)		(s).angles
-	#define SUB_VELOCITY		velocity
-	#define SUB_AVELOCITY		avelocity
-	#define SUB_ORIGIN			origin
-	#define SUB_SETORIGIN(s,v)	setorigin((s), (v))
-	#define SUB_NEXTTHINK		nextthink
-	#define SUB_THINK			think
-	#define SUB_LTIME			ltime
-	#define SUB_FLAGS			flags
-
-#elif defined(CSQC)
-
-	void _Movetype_LinkEdict(float touch_triggers);
-
-	#define SUB_ANGLES(s)	(s).move_angles
-	#define SUB_VELOCITY	move_velocity
-	#define SUB_AVELOCITY	move_avelocity
-	#define SUB_ORIGIN		move_origin
-	#define SUB_NEXTTHINK	move_nextthink
-	#define SUB_THINK		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;
-		WITH(entity, self, s, _Movetype_LinkEdict(true));
-	}
-
-#endif
+#pragma once
+#include "defs.qh"
 
 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;
 
 .vector destvec;
 .vector destvec2;
 
-// player animation state
-.float animstate_startframe;
-.float animstate_numframes;
-.float animstate_framerate;
-.float animstate_starttime;
-.float animstate_endtime;
-.float animstate_override;
-.float animstate_looping;
-
 .float	delay;
 .float	wait;
 .float	lip;
@@ -64,7 +20,7 @@ void SUB_VanishOrRemove (entity ent);
 .string  platmovetype;
 .float platmovetype_start, platmovetype_end;
 
-entity activator;
+//entity activator;
 
 .string killtarget;
 
@@ -86,21 +42,16 @@ entity activator;
 
 .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;
-const float DAMAGE_NO	= 0;
-const float DAMAGE_YES	= 1;
-const float DAMAGE_AIM	= 2;
-
-float	STATE_TOP		= 0;
-float	STATE_BOTTOM	= 1;
-float	STATE_UP		= 2;
-float	STATE_DOWN		= 3;
+const int DAMAGE_NO = 0;
+const int DAMAGE_YES = 1;
+const int DAMAGE_AIM = 2;
 
 .string		noise, noise1, noise2, noise3;	// contains names of wavs to play
 
 .float		max_health;		// players maximum health is stored here
 #endif
-
-#endif