From: Rudolf Polzer <divverent@alientrap.org>
Date: Sun, 5 Dec 2010 16:12:19 +0000 (+0100)
Subject: clean up SetMovedir related code a little
X-Git-Tag: xonotic-v0.1.0preview~69^2~7
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a51b7d2f47a9bc2a86aee81182b127781e249247;p=xonotic%2Fxonotic-data.pk3dir.git

clean up SetMovedir related code a little
---

diff --git a/qcsrc/server/g_subs.qc b/qcsrc/server/g_subs.qc
index 500240d6c..47f3a5a69 100644
--- a/qcsrc/server/g_subs.qc
+++ b/qcsrc/server/g_subs.qc
@@ -750,9 +750,7 @@ void InitTrigger()
 {
 // trigger angles are used for one-way touches.  An angle of 0 is assumed
 // to mean no restrictions, so use a yaw of 360 instead.
-	if (self.movedir == '0 0 0')
-	if (self.angles != '0 0 0')
-		SetMovedir ();
+	SetMovedir ();
 	self.solid = SOLID_TRIGGER;
 	SetBrushEntityModel();
 	self.movetype = MOVETYPE_NONE;
@@ -764,9 +762,7 @@ void InitSolidBSPTrigger()
 {
 // trigger angles are used for one-way touches.  An angle of 0 is assumed
 // to mean no restrictions, so use a yaw of 360 instead.
-	if (self.movedir == '0 0 0')
-	if (self.angles != '0 0 0')
-		SetMovedir ();
+	SetMovedir ();
 	self.solid = SOLID_BSP;
 	SetBrushEntityModel();
 	self.movetype = MOVETYPE_NONE; // why was this PUSH? -div0
diff --git a/qcsrc/server/t_jumppads.qc b/qcsrc/server/t_jumppads.qc
index 5fced5fe7..36048e860 100644
--- a/qcsrc/server/t_jumppads.qc
+++ b/qcsrc/server/t_jumppads.qc
@@ -286,8 +286,7 @@ void trigger_push_findtarget()
  */
 void spawnfunc_trigger_push()
 {
-	if (self.angles != '0 0 0')
-		SetMovedir ();
+	SetMovedir ();
 
 	EXACTTRIGGER_INIT;