X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Fteleporters.qc;h=b9698446c2e67f6b4b9d214e047a3559d5a1c50d;hb=f5947c48bfb925221717a49adbc56c9c97a01e71;hp=c8f9ad245d0ca7c24a7311de92005e62dc9acb16;hpb=fd1414848347ba074259e7bd0959a677adadb63d;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc
index c8f9ad245..b9698446c 100644
--- a/qcsrc/common/mapobjects/teleporters.qc
+++ b/qcsrc/common/mapobjects/teleporters.qc
@@ -223,9 +223,11 @@ entity Simple_TeleportPlayer(entity teleporter, entity player)
 		if(vdist(player.velocity, >, e.speed))
 			player.velocity = normalize(player.velocity) * max(0, e.speed);
 
-	if(STAT(TELEPORT_MAXSPEED, player))
-		if(vdist(player.velocity, >, STAT(TELEPORT_MAXSPEED, player)))
-			player.velocity = normalize(player.velocity) * max(0, STAT(TELEPORT_MAXSPEED, player));
+	if(!(teleporter.classname == "trigger_teleport" && teleporter.spawnflags & TELEPORT_KEEP_SPEED) &&
+	   !(teleporter.classname == "target_teleporter" && teleporter.spawnflags & TARGET_TELEPORTER_KEEP_SPEED))
+		if(STAT(TELEPORT_MAXSPEED, player))
+			if(vdist(player.velocity, >, STAT(TELEPORT_MAXSPEED, player)))
+				player.velocity = normalize(player.velocity) * max(0, STAT(TELEPORT_MAXSPEED, player));
 
 	locout = e.origin + '0 0 1' * (1 - player.mins.z - 24);