Merge branch 'master' into Mario/vehicles

[xonotic/xonotic-data.pk3dir.git] / qcsrc / server / portals.qc

diff --git a/qcsrc/server/portals.qc b/qcsrc/server/portals.qc
index ad8aea50cdf068c9c0f164a2ab384b9e5fa7bac9..61345c9adce0a861089650a10e48a63d57ad518d 100644 (file)
--- a/qcsrc/server/portals.qc
+++ b/qcsrc/server/portals.qc
@@ -270,6 +270,10 @@ void Portal_Touch()
        if(other.classname == "grapplinghook")
                return; // handled by think
 
+       if(!autocvar_g_vehicles_teleportable)
+       if(other.vehicle_flags & VHF_ISVEHICLE)
+               return; // no teleporting vehicles?
+
        if(!self.enemy)
                error("Portal_Touch called for a broken portal\n");