X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Ftriggers%2Ftrigger%2Fimpulse.qc;h=7b8ebcfde91e67627c4ca76b6494441d87fc59a5;hb=ae2c1407ec9a05e4f501a6604a7cce8e1030df9f;hp=89ca2e03d6fdc1911d47e722550dd18f031b3346;hpb=80034856c349eb74bdbd70f9133b023392cffecc;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/triggers/trigger/impulse.qc b/qcsrc/common/triggers/trigger/impulse.qc
index 89ca2e03d..7b8ebcfde 100644
--- a/qcsrc/common/triggers/trigger/impulse.qc
+++ b/qcsrc/common/triggers/trigger/impulse.qc
@@ -35,7 +35,17 @@ void trigger_impulse_touch1()
 	other.lastpushtime = time;
 	if(!pushdeltatime) return;
 
-	other.velocity = other.velocity + normalize(targ.origin - self.origin) * str * pushdeltatime;
+	if(self.spawnflags & 64)
+	{
+		float addspeed = str - other.velocity * normalize(targ.origin - self.origin);
+		if (addspeed > 0)
+		{
+			float accelspeed = min(8 * pushdeltatime * str, addspeed);
+			other.velocity += accelspeed * normalize(targ.origin - self.origin);
+		}
+	}
+	else
+		other.velocity = other.velocity + normalize(targ.origin - self.origin) * str * pushdeltatime;
 	other.flags &= ~FL_ONGROUND;
 #ifdef SVQC
 	UpdateCSQCProjectile(other);
@@ -137,7 +147,7 @@ bool trigger_impulse_send(entity to, int sf)
 
 void trigger_impulse_link()
 {
-	Net_LinkEntity(self, 0, false, trigger_impulse_send);
+	//Net_LinkEntity(self, 0, false, trigger_impulse_send);
 }
 
 void spawnfunc_trigger_impulse()