X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Fmapobjects%2Fteleporters.qc;h=651566c71b6fbec9ff4fd7ef5052a14dea7919ce;hb=804fe9a9efdb8f1689fa4ac63e3398547b3fa477;hp=ab9c8dca570c1a3b196973b85515beb952489545;hpb=19c09c8cfc6a4cb71c07e63bf739b7720ec6b0a0;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/mapobjects/teleporters.qc b/qcsrc/common/mapobjects/teleporters.qc
index ab9c8dca5..651566c71 100644
--- a/qcsrc/common/mapobjects/teleporters.qc
+++ b/qcsrc/common/mapobjects/teleporters.qc
@@ -3,21 +3,20 @@
 #if defined(CSQC)
 #elif defined(MENUQC)
 #elif defined(SVQC)
-    #include <lib/warpzone/common.qh>
-    #include <lib/warpzone/util_server.qh>
-    #include <lib/warpzone/server.qh>
-    #include "../constants.qh"
-	#include "../mapobjects/subs.qh"
-    #include "../util.qh"
-    #include <server/weapons/csqcprojectile.qh>
-    #include <server/autocvars.qh>
-    #include <server/constants.qh>
-    #include <server/defs.qh>
-    #include "../deathtypes/all.qh"
-    #include "../turrets/sv_turrets.qh"
-    #include "../vehicles/all.qh"
-    #include <common/gamemodes/_mod.qh>
-    #include <server/anticheat.qh>
+	#include <common/constants.qh>
+	#include <common/deathtypes/all.qh>
+	#include <common/gamemodes/_mod.qh>
+	#include <common/mapobjects/subs.qh>
+	#include <common/stats.qh>
+	#include <common/turrets/sv_turrets.qh>
+	#include <common/util.qh>
+	#include <common/vehicles/all.qh>
+	#include <common/weapons/_all.qh>
+	#include <lib/warpzone/common.qh>
+	#include <lib/warpzone/server.qh>
+	#include <lib/warpzone/util_server.qh>
+	#include <server/anticheat.qh>
+	#include <server/weapons/csqcprojectile.qh>
 #endif
 
 #ifdef SVQC
@@ -224,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);