ExactTrigger_Init: let map-specified mins/maxs override the setmodel ones, if nonzero

[xonotic/xonotic-data.pk3dir.git] / qcsrc / warpzonelib / client.qc

diff --git a/qcsrc/warpzonelib/client.qc b/qcsrc/warpzonelib/client.qc
index 2f4601219ac115cf4bd4fef51fbc90c48816bddb..3c3eaf5a3dacda1350719773fe293690f8f8e1c5 100644 (file)
--- a/qcsrc/warpzonelib/client.qc
+++ b/qcsrc/warpzonelib/client.qc
@@ -122,7 +122,7 @@ vector WarpZone_FixNearClip(vector o, vector c0, vector c1, vector c2, vector c3
                if(WarpZone_PlaneDist(e, o) < 0)
                        return '0 0 0';
                        // can't really be, though, but if it is, this is not my warpzone, but a random different one in the same mins/maxs
-               pd = min(
+               pd = min4(
                                WarpZone_PlaneDist(e, c0),
                                WarpZone_PlaneDist(e, c1),
                                WarpZone_PlaneDist(e, c2),
@@ -154,7 +154,7 @@ void WarpZone_FixView()
        warpzone_saved_angles = warpzone_fixview_angles;
        warpzone_saved_cl_viewangles = warpzone_fixview_cl_viewangles;
 
-       nearclip = '0 0 1' * (cvar("r_nearclip") * cvar("cl_warpzonenudge"));
+       nearclip = '0 0 1' * (cvar("r_nearclip") * 1.125);
        corner0 = cs_unproject('0 0 0' + nearclip);
        corner1 = cs_unproject('1 0 0' * cvar("vid_conwidth") + nearclip);
        corner2 = cs_unproject('0 1 0' * cvar("vid_conheight") + nearclip);