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 cb671ddc70fd7840b5cf0a027dadb24fc6a489f9..8f7125dd8fdee7f40ec9b151fa42b48d29c1dddb 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");