X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Fsubs.qh;h=1b3bc5e690d438f6eeb1b0bf228eab6efd7ee75a;hp=6a844261379a971e3d76da1a371008aac2c3f63a;hb=d865de7a9a17c5a1d9286aec40f68c3530697660;hpb=f438b415278f56c0cf86e2018b45fb3e6972259c

diff --git a/qcsrc/common/triggers/subs.qh b/qcsrc/common/triggers/subs.qh
index 6a8442613..1b3bc5e69 100644
--- a/qcsrc/common/triggers/subs.qh
+++ b/qcsrc/common/triggers/subs.qh
@@ -1,47 +1,10 @@
-#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(entity this, 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)
-	{
-		s.move_origin = v;
-		_Movetype_LinkEdict(s, true);
-	}
-
-#endif
-
+#pragma once
 
 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;
 
@@ -94,5 +57,3 @@ float	STATE_DOWN		= 3;
 
 .float		max_health;		// players maximum health is stored here
 #endif
-
-#endif