Merge branch 'bones_was_here/q1bsp_hitbox' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / lib / warpzone / util_server.qc

diff --git a/qcsrc/lib/warpzone/util_server.qc b/qcsrc/lib/warpzone/util_server.qc
index 888112ce5e50ff0f57fa6e931226d1e6d6c20f21..1c22ee3829c77ed701de9ed6f91667b5abbfa798 100644 (file)
--- a/qcsrc/lib/warpzone/util_server.qc
+++ b/qcsrc/lib/warpzone/util_server.qc
@@ -9,7 +9,7 @@
 #endif
 #include "common.qh"
 
-void WarpZoneLib_ExactTrigger_Init(entity this)
+void WarpZoneLib_ExactTrigger_Init(entity this, bool unsetmodel)
 {
        vector mi, ma;
        if (this.movedir == '0 0 0')
@@ -46,11 +46,7 @@ void WarpZoneLib_ExactTrigger_Init(entity this)
        else
                setsize(this, this.mins, this.maxs);
        set_movetype(this, MOVETYPE_NONE);
-       this.model = "";
 
-       // Xonotic and Nexuiz maps assume triggers will be activated by adjacent players
-       // this causes the touch func to be called in that case
-       // prior to sv_legacy_bbox_expand 0 DP always did this for SVQC and never for CSQC
-       if (!Q3COMPAT_COMMON)
-               setsize(this, this.mins - '1 1 1', this.maxs + '1 1 1');
+       if (unsetmodel)
+               this.model = "";
 }