]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Revert "Remove legacy Quake bbox expansion: map entities"
authorbones_was_here <bones_was_here@xonotic.au>
Thu, 25 May 2023 06:57:02 +0000 (16:57 +1000)
committerbones_was_here <bones_was_here@xonotic.au>
Thu, 25 May 2023 06:57:02 +0000 (16:57 +1000)
This reverts commit 5f32ac7b184434178f0b2c501ade8c86574e6c48.

22 files changed:
qcsrc/common/constants.qh
qcsrc/common/gamemodes/gamemode/ctf/sv_ctf.qh
qcsrc/common/gamemodes/gamemode/domination/sv_domination.qc
qcsrc/common/gamemodes/gamemode/keyhunt/sv_keyhunt.qc
qcsrc/common/items/item.qh
qcsrc/common/items/item/armor.qh
qcsrc/common/items/item/health.qh
qcsrc/common/items/item/pickup.qh
qcsrc/common/mapobjects/func/conveyor.qc
qcsrc/common/mapobjects/func/ladder.qc
qcsrc/common/mapobjects/trigger/swamp.qc
qcsrc/common/mapobjects/trigger/viewloc.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qc
qcsrc/common/mutators/mutator/buffs/sv_buffs.qh
qcsrc/common/mutators/mutator/powerups/powerups.qh
qcsrc/common/physics/movetypes/movetypes.qc
qcsrc/common/weapons/weapon/porto.qc
qcsrc/lib/warpzone/common.qc
qcsrc/lib/warpzone/util_server.qc
qcsrc/server/bot/default/navigation.qc
qcsrc/server/bot/default/waypoints.qc
xonotic-server.cfg

index e3be1e1d002b3c22fccdc053f39d23ee9f2045c9..18e4e6100142b9c4ee73c3fb27ab94ec61481db3 100644 (file)
@@ -72,7 +72,7 @@ const int FL_INWATER                          = 16; /* BIT(3) */      // for enter / leave water splash
 const int FL_MONSTER                           = 32; /* BIT(4) */
 const int FL_GODMODE                           = 64; /* BIT(5) */      // player cheat
 const int FL_NOTARGET                          = 128; /* BIT(6) */     // player cheat
-const int FL_ITEM                                      = 256; /* BIT(7) */     // extra wide size for bonus items IF sv_legacy_bbox_expand is 1
+const int FL_ITEM                                      = 256; /* BIT(7) */     // extra wide size for bonus items
 const int FL_ONGROUND                          = 512; /* BIT(8) */     // standing on something
 const int FL_PARTIALGROUND                     = 1024; /* BIT(9) */    // not all corners are valid
 const int FL_WATERJUMP                         = 2048; /* BIT(10) */   // player jumping out of water
index 577dbf3c5034a078085d5a071fd2716a4488a2aa..adb061809fe053f56c36f763e31fb7195e0e3928 100644 (file)
@@ -6,8 +6,8 @@
 #include <common/gamemodes/sv_rules.qh>
 
 CLASS(Flag, Pickup)
-    ATTRIB(Flag, m_mins, vector, (PL_MIN_CONST + '-10 -10 -13') * 1.4); // scaling be damned
-    ATTRIB(Flag, m_maxs, vector, (PL_MAX_CONST + '10 10 -13') * 1.4); // 0.8.5 used '0 0 -13' with sv_legacy_bbox_expand 1
+    ATTRIB(Flag, m_mins, vector, (PL_MIN_CONST + '0 -13') * 1.4); // scaling be damned
+    ATTRIB(Flag, m_maxs, vector, (PL_MAX_CONST + '0 0 -13') * 1.4);
 ENDCLASS(Flag)
 Flag CTF_FLAG;
 void ctf_Initialize();
index af17a1498837b695c08fa5857a03e3c50dd37ac8..a82be5a3c10df5df35c76ad37e7e152a4431c79c 100644 (file)
@@ -297,7 +297,7 @@ void dom_controlpoint_setup(entity this)
        if(!this.flags & FL_ITEM)
                IL_PUSH(g_items, this);
        this.flags = FL_ITEM;
-       setsize(this, '-48 -48 -32', '48 48 32'); // 0.8.5 used '-32 -32 -32', '32 32 32' with sv_legacy_bbox_expand 1
+       setsize(this, '-32 -32 -32', '32 32 32');
        setorigin(this, this.origin + '0 0 20');
        droptofloor(this);
 
index ac0e4077448866615de97108810763f66473d32f..8396c1e619d0f80c1fca39db7197f224fbee26db 100644 (file)
@@ -45,8 +45,8 @@ const float KH_KEY_XYSPEED = 45;
 #endif
 const float KH_KEY_WP_ZSHIFT = 20;
 
-const vector KH_KEY_MIN = '-25 -25 -46'; // 0.8.5 used '-10 -10 -46' with sv_legacy_bbox_expand 1
-const vector KH_KEY_MAX = '25 25 3';     // 0.8.5 used '10 10 3'     with sv_legacy_bbox_expand 1
+const vector KH_KEY_MIN = '-10 -10 -46';
+const vector KH_KEY_MAX = '10 10 3';
 const float KH_KEY_BRIGHTNESS = 2;
 
 bool kh_no_radar_circles;
index a4fea71ad8ec73842ebbe946d377a8b88a4e2a61..350421465459bdd57312511b2cd935c565327a1d 100644 (file)
@@ -58,14 +58,6 @@ const int ITS_ALLOWFB           = BIT(4);
 const int ITS_ALLOWSI           = BIT(5);
 const int ITS_GLOW              = BIT(6);
 
-// item bboxes for sv_legacy_bbox_expand 0
-// Small, Default and Large (large maxs are used with default mins)
-const vector ITEM_S_MINS = '-16 -16 0'; // smaller items now get the same "unexpanded" bbox that normal items
-const vector ITEM_S_MAXS = '16 16 48';  // had during MoveOutOfSolid and DropToFloor (before expansion) in 0.8.5
-const vector ITEM_D_MINS = '-30 -30 0'; // 0.8.5 set '-16 -16 0' then DP subtracted '15 15 1' but NetRadiant used '-30 -30 0'
-const vector ITEM_D_MAXS = '30 30 48';  // 0.8.5 set '16 16 48' then DP added '15 15 1' but NetRadiant used '30 30 32'
-const vector ITEM_L_MAXS = '30 30 70';  // 0.8.5 set '16 16 80' for powerups, '16 16 70' for megas, '16 16 60' for buffs
-
 .float fade_start;
 .float fade_end;
 
index d487d1e1252ccc0787185c6a31eac70f7ca7ba37..f8cabaa0595f08bacfde5fbf9b14c5ffae0654d4 100644 (file)
@@ -3,6 +3,8 @@
 #include "pickup.qh"
 CLASS(Armor, Pickup)
 #ifdef SVQC
+    ATTRIB(Armor, m_mins, vector, '-16 -16 0');
+    ATTRIB(Armor, m_maxs, vector, '16 16 48');
     ATTRIB(Armor, m_pickupevalfunc, float(entity player, entity item), healtharmor_pickupevalfunc);
     ATTRIB(Armor, m_botvalue, int, 5000);
 #endif
@@ -44,8 +46,6 @@ REGISTER_ITEM(ArmorSmall, Armor) {
        this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
-    this.m_mins                 =   ITEM_S_MINS;
-    this.m_maxs                 =   ITEM_S_MAXS;
     this.m_itemid               =   IT_RESOURCE;
     this.m_respawntime          =   GET(g_pickup_respawntime_short);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
@@ -88,8 +88,6 @@ REGISTER_ITEM(ArmorMedium, Armor) {
        this.m_icon             =   "armor"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
-    this.m_mins                 =   ITEM_S_MINS;
-    this.m_maxs                 =   ITEM_S_MAXS;
     this.m_itemid               =   IT_RESOURCE;
     this.m_respawntime          =   GET(g_pickup_respawntime_medium);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_medium);
@@ -179,7 +177,7 @@ REGISTER_ITEM(ArmorMega, Armor) {
     this.m_waypoint             =   _("Mega armor");
     this.m_waypointblink        =   2;
 #ifdef SVQC
-    this.m_maxs                 =   ITEM_L_MAXS;
+    this.m_maxs                 =   '16 16 70';
     this.m_itemid               =   IT_RESOURCE;
     this.m_respawntime          =   GET(g_pickup_respawntime_long);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
index 2ac1f8e1388d2b939985185444c6878d27868027..ca94651aa328a5e7d314e66c2d0b7906332c1129 100644 (file)
@@ -3,6 +3,8 @@
 #include "pickup.qh"
 CLASS(Health, Pickup)
 #ifdef SVQC
+    ATTRIB(Health, m_mins, vector, '-16 -16 0');
+    ATTRIB(Health, m_maxs, vector, '16 16 48');
     ATTRIB(Health, m_pickupevalfunc, float(entity player, entity item), healtharmor_pickupevalfunc);
     ATTRIB(Health, m_botvalue, int, 5000);
 #endif
@@ -44,8 +46,6 @@ REGISTER_ITEM(HealthSmall, Health) {
        this.m_icon             =   "health"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
-    this.m_mins                 =   ITEM_S_MINS;
-    this.m_maxs                 =   ITEM_S_MAXS;
     this.m_itemid               =   IT_RESOURCE;
     this.m_respawntime          =   GET(g_pickup_respawntime_short);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
@@ -88,8 +88,6 @@ REGISTER_ITEM(HealthMedium, Health) {
        this.m_icon             =   "health"; // compatible with Xonotic v0.8.2 or lower
 #endif
 #ifdef SVQC
-    this.m_mins                 =   ITEM_S_MINS;
-    this.m_maxs                 =   ITEM_S_MAXS;
     this.m_itemid               =   IT_RESOURCE;
     this.m_respawntime          =   GET(g_pickup_respawntime_short);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_short);
@@ -179,7 +177,7 @@ REGISTER_ITEM(HealthMega, Health) {
     this.m_waypoint             =   _("Mega health");
     this.m_waypointblink        =   2;
 #ifdef SVQC
-    this.m_maxs                 =   ITEM_L_MAXS;
+    this.m_maxs                 =   '16 16 70';
     this.m_itemid               =   IT_RESOURCE;
     this.m_respawntime          =   GET(g_pickup_respawntime_long);
     this.m_respawntimejitter    =   GET(g_pickup_respawntimejitter_long);
index b42e18aea9b993c197f33c9345893f0219ba9e85..d21923e258dc196ef15e80209e3fbfb230b9de63 100644 (file)
@@ -35,8 +35,8 @@ CLASS(Pickup, GameItem)
     }
     ATTRIB(Pickup, m_itemid, int, 0);
 #ifdef SVQC
-    ATTRIB(Pickup, m_mins, vector, ITEM_D_MINS);
-    ATTRIB(Pickup, m_maxs, vector, ITEM_D_MAXS);
+    ATTRIB(Pickup, m_mins, vector, '-16 -16 0');
+    ATTRIB(Pickup, m_maxs, vector, '16 16 48');
     ATTRIB(Pickup, m_botvalue, int, 0);
     ATTRIB(Pickup, m_itemflags, int, 0);
     float generic_pickupevalfunc(entity player, entity item);
index 724fb929072a11adb92d5eb7352a819a2ce61dbc..3666dd337b2c56ffed1b03ca54d1339dfe98d4e8 100644 (file)
@@ -21,12 +21,20 @@ void conveyor_think(entity this)
        {
                FOREACH_ENTITY_RADIUS((this.absmin + this.absmax) * 0.5, vlen(this.absmax - this.absmin) * 0.5 + 1, it.conveyor.active == ACTIVE_NOT && isPushable(it),
                {
-                       if (WarpZoneLib_ExactTrigger_Touch(this, it, false))
+                       vector emin = it.absmin;
+                       vector emax = it.absmax;
+                       if(this.solid == SOLID_BSP)
                        {
-                               if(!it.conveyor)
-                                       IL_PUSH(g_conveyed, it);
-                               it.conveyor = this;
+                               emin -= '1 1 1';
+                               emax += '1 1 1';
                        }
+                       if(boxesoverlap(emin, emax, this.absmin, this.absmax)) // quick
+                               if(WarpZoneLib_BoxTouchesBrush(emin, emax, this, it)) // accurate
+                               {
+                                       if(!it.conveyor)
+                                               IL_PUSH(g_conveyed, it);
+                                       it.conveyor = this;
+                               }
                });
 
                IL_EACH(g_conveyed, it.conveyor == this,
index d60c28abc81cf04cb54c0d390a4166a8b5c36da8..0d4e253f091ce3cb83788bb39cf95b78171dd45d 100644 (file)
@@ -3,7 +3,6 @@ REGISTER_NET_LINKED(ENT_CLIENT_LADDER)
 
 void func_ladder_think(entity this)
 {
-
 #ifdef CSQC
        // TODO: check if this is what is causing the glitchiness when switching between them
        float dt = time - this.move_time;
@@ -20,11 +19,21 @@ void func_ladder_think(entity this)
 
        FOREACH_ENTITY_RADIUS((this.absmin + this.absmax) * 0.5, vlen(this.absmax - this.absmin) * 0.5 + 1, !it.ladder_entity && IS_PLAYER(it) && it.move_movetype != MOVETYPE_NOCLIP && !IS_DEAD(it),
        {
-               if (WarpZoneLib_ExactTrigger_Touch(this, it, false))
+               vector emin = it.absmin;
+               vector emax = it.absmax;
+               if(this.solid == SOLID_BSP || (IS_CSQC && this.solid == SOLID_TRIGGER)) // CSQC doesn't expand properly
+               {
+                       emin -= '1 1 1';
+                       emax += '1 1 1';
+               }
+               if(boxesoverlap(emin, emax, this.absmin, this.absmax)) // quick
                {
-                       if(!it.ladder_entity)
-                               IL_PUSH(g_ladderents, it);
-                       it.ladder_entity = this;
+                       if(WarpZoneLib_BoxTouchesBrush(emin, emax, this, it)) // accurate
+                       {
+                               if(!it.ladder_entity)
+                                       IL_PUSH(g_ladderents, it);
+                               it.ladder_entity = this;
+                       }
                }
        });
 
@@ -169,6 +178,10 @@ NET_HANDLE(ENT_CLIENT_LADDER, bool isnew)
        this.move_time = time;
        this.entremove = func_ladder_remove;
 
+       // NOTE: CSQC's version of setorigin doesn't expand
+       this.absmin -= '1 1 1';
+       this.absmax += '1 1 1';
+
        return true;
 }
 #endif
index 061c621313494256c7b4666bbb64d792ff769e3c..a54665962c975ea494677ac83c231c36f266a6bf 100644 (file)
@@ -31,12 +31,20 @@ void swamp_think(entity this)
        {
                FOREACH_ENTITY_RADIUS((this.absmin + this.absmax) * 0.5, vlen(this.absmax - this.absmin) * 0.5 + 1, it.swampslug.active == ACTIVE_NOT && IS_PLAYER(it) && !IS_DEAD(it),
                {
-                       if (WarpZoneLib_ExactTrigger_Touch(this, it, false))
+                       vector emin = it.absmin;
+                       vector emax = it.absmax;
+                       if(this.solid == SOLID_BSP)
                        {
-                               if(!it.swampslug)
-                                       IL_PUSH(g_swamped, it);
-                               it.swampslug = this;
+                               emin -= '1 1 1';
+                               emax += '1 1 1';
                        }
+                       if(boxesoverlap(emin, emax, this.absmin, this.absmax)) // quick
+                               if(WarpZoneLib_BoxTouchesBrush(emin, emax, this, it)) // accurate
+                               {
+                                       if(!it.swampslug)
+                                               IL_PUSH(g_swamped, it);
+                                       it.swampslug = this;
+                               }
                });
 
                IL_EACH(g_swamped, it.swampslug == this,
index ddfd5a1f1ed657eb58dccf65875e85c1b1372cda..4679e75f7f0f521c4248676365578de1e10b6851 100644 (file)
@@ -32,16 +32,37 @@ void viewloc_think(entity this)
 #if 1
        FOREACH_CLIENT(!it.viewloc && IS_PLAYER(it),
        {
-               if (WarpZoneLib_ExactTrigger_Touch(this, it, false))
-                       it.viewloc = this;
+               vector emin = it.absmin;
+               vector emax = it.absmax;
+               if(this.solid == SOLID_BSP)
+               {
+                       emin -= '1 1 1';
+                       emax += '1 1 1';
+               }
+               if(boxesoverlap(emin, emax, this.absmin, this.absmax)) // quick
+               {
+                       if(WarpZoneLib_BoxTouchesBrush(emin, emax, this, it)) // accurate
+                               it.viewloc = this;
+               }
        });
 #else
-       for(e = findradius((this.absmin + this.absmax) * 0.5, vlen(this.absmax - this.absmin) * 0.5 + 1); e; e = e.chain)
-               if(!e.viewloc)
-                       if(IS_PLAYER(e)) // should we support non-player entities with this?
-                       //if(!IS_DEAD(e)) // death view is handled separately, we can't override this just yet
-                               if (WarpZoneLib_ExactTrigger_Touch(this, it, false))
-                                       e.viewloc = this;
+
+               for(e = findradius((this.absmin + this.absmax) * 0.5, vlen(this.absmax - this.absmin) * 0.5 + 1); e; e = e.chain)
+                       if(!e.viewloc)
+                               if(IS_PLAYER(e)) // should we support non-player entities with this?
+                               //if(!IS_DEAD(e)) // death view is handled separately, we can't override this just yet
+                               {
+                                       vector emin = e.absmin;
+                                       vector emax = e.absmax;
+                                       if(this.solid == SOLID_BSP)
+                                       {
+                                               emin -= '1 1 1';
+                                               emax += '1 1 1';
+                                       }
+                                       if(boxesoverlap(emin, emax, this.absmin, this.absmax)) // quick
+                                               if(WarpZoneLib_BoxTouchesBrush(emin, emax, this, e)) // accurate
+                                                       e.viewloc = this;
+                               }
 #endif
 
        this.nextthink = time;
index 7ed7ca45f745869704ee165886df0c53f9830ad2..367277e7f2159acb1adfca535c686131a79a0e00 100644 (file)
@@ -314,7 +314,7 @@ void buff_Think(entity this)
                this.skin = buff.m_skin;
 
                setmodel(this, MDL_BUFF);
-               setsize(this, ITEM_D_MINS, ITEM_L_MAXS);
+               setsize(this, BUFF_MIN, BUFF_MAX);
 
                if(this.buff_waypoint)
                {
@@ -440,7 +440,7 @@ void buff_Init(entity this)
        setthink(this, buff_Think);
        settouch(this, buff_Touch);
        setmodel(this, MDL_BUFF);
-       setsize(this, ITEM_D_MINS, ITEM_L_MAXS);
+       setsize(this, BUFF_MIN, BUFF_MAX);
        this.reset = buff_Reset;
        this.nextthink = time + 0.1;
        this.gravity = 1;
index c8281a003372bf8f909df8632c8e3f0d9323e6ee..c8b2b363d12e6e704b214036e6cf33b44cfc0c09 100644 (file)
@@ -74,6 +74,9 @@ float autocvar_g_buffs_luck_damagemultiplier = 3;
 .float buff_shield; // delay for players to keep them from spamming buff pickups
 .entity buff_model; // controls effects (TODO: make csqc)
 
+const vector BUFF_MIN = ('-16 -16 0');
+const vector BUFF_MAX = ('16 16 60');
+
 float buff_Available(entity buff);
 
 void buff_RemoveAll(entity actor, int removal_type);
index ecd754672d3bbed1e9fbe544a71b4065e8b2bd2c..3a614e38829485e838a2fa8c54b5135080424219 100644 (file)
@@ -3,7 +3,8 @@
 #include <common/items/item/pickup.qh>
 CLASS(Powerup, Pickup)
 #ifdef SVQC
-    ATTRIB(Powerup, m_maxs, vector, ITEM_L_MAXS);
+    ATTRIB(Powerup, m_mins, vector, '-16 -16 0');
+    ATTRIB(Powerup, m_maxs, vector, '16 16 80');
     ATTRIB(Powerup, m_botvalue, int, 11000);
     ATTRIB(Powerup, m_itemflags, int, FL_POWERUP);
     ATTRIB(Powerup, m_respawntime, float(), GET(g_pickup_respawntime_powerup));
index c913970c49416b0b63476032fa84765b11d543d3..651b6f3d642e7f861fe1cb4adcb439b5a7d6a8e3 100644 (file)
@@ -515,11 +515,44 @@ void _Movetype_LinkEdict(entity this, bool touch_triggers)  // SV_LinkEdict
 {
        if(autocvar__movetype_debug)
        {
-               this.absmin = this.origin + this.mins;
-               this.absmax = this.origin + this.maxs;
+               vector mi, ma;
+               if(this.solid == SOLID_BSP)
+               {
+                       // TODO set the absolute bbox
+                       mi = this.mins;
+                       ma = this.maxs;
+               }
+               else
+               {
+                       mi = this.mins;
+                       ma = this.maxs;
+               }
+               mi += this.origin;
+               ma += this.origin;
+
+               if(this.flags & FL_ITEM)
+               {
+                       mi -= '15 15 1';
+                       ma += '15 15 1';
+               }
+               else
+               {
+                       mi -= '1 1 1';
+                       ma += '1 1 1';
+               }
+
+               this.absmin = mi;
+               this.absmax = ma;
        }
        else
+       {
                setorigin(this, this.origin); // calls SV_LinkEdict
+       #ifdef CSQC
+               // NOTE: CSQC's version of setorigin doesn't expand
+               this.absmin -= '1 1 1';
+               this.absmax += '1 1 1';
+       #endif
+       }
 
        if(touch_triggers)
                _Movetype_LinkEdict_TouchAreaGrid(this);
index b681078c2670d07d8a27cf04d632466fbda11c80..7ee4162157077a97024dc710403f51ff8e845df1 100644 (file)
@@ -118,8 +118,7 @@ void W_Porto_Fail(entity this, float failhard)
 
        if(this.cnt < 0 && !failhard && this.realowner.playerid == this.playerid && !IS_DEAD(this.realowner) && !(STAT(WEAPONS, this.realowner) & WEPSET(PORTO)))
        {
-               // FIXME: item properties should be obtained from the registry
-               setsize(this, ITEM_D_MINS, ITEM_D_MAXS);
+               setsize(this, '-16 -16 0', '16 16 48');
                setorigin(this, this.origin + trace_plane_normal);
                if(move_out_of_solid(this))
                {
index 2103b87c7e64ea3318928c01b035d1d2c71fb0ce..d9a12517d1512efa663e3d5234eae467156edaf8 100644 (file)
@@ -811,12 +811,12 @@ entity WarpZone_RefSys_SpawnSameRefSys(entity me)
 bool WarpZoneLib_ExactTrigger_Touch(entity this, entity toucher, bool touchfunc)
 {
        vector emin = toucher.absmin, emax = toucher.absmax;
-       if (!Q3COMPAT_COMMON)
+       if(STAT(Q3COMPAT))
        {
-               // Xonotic and Nexuiz maps assume triggers will be activated by adjacent players
-               // prior to sv_legacy_bbox_expand 0 DP always did this for SVQC and never for CSQC
-               emin -= '1 1 1';
-               emax += '1 1 1';
+               // DP's tracebox enlarges absolute bounding boxes by a single quake unit
+               // we must undo that here to allow accurate touching
+               emin += '1 1 1';
+               emax -= '1 1 1';
        }
 
        // if called from a touch func, we can assume the boxes do overlap
@@ -826,6 +826,7 @@ bool WarpZoneLib_ExactTrigger_Touch(entity this, entity toucher, bool touchfunc)
        return WarpZoneLib_BoxTouchesBrush(emin, emax, this, toucher); // accurate
 }
 
+
 void WarpZoneLib_MoveOutOfSolid_Expand(entity e, vector by)
 {
        const float eps = 0.0625;
index 888112ce5e50ff0f57fa6e931226d1e6d6c20f21..5f1aebf490268365fdd74e3e6d1fd6da87417c2c 100644 (file)
@@ -47,10 +47,4 @@ void WarpZoneLib_ExactTrigger_Init(entity this)
                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');
 }
index 6a1dc962b37746a34c3c31cccb49ba03b90971bf..87bb5c0cd18246bbcbd16b5678776a3364860338 100644 (file)
@@ -225,8 +225,8 @@ bool navigation_checkladders(entity e, vector org, vector m1, vector m2, vector
        IL_EACH(g_ladders, true,
        {
                if(it.bot_pickup)
-               if(boxesoverlap(org + m1, org + m2, it.absmin, it.absmax))
-               if(boxesoverlap(end, end2, it.absmin + vec2(m1), it.absmax + vec2(m2)))
+               if(boxesoverlap(org + m1 + '-1 -1 -1', org + m2 + '1 1 1', it.absmin, it.absmax))
+               if(boxesoverlap(end, end2, it.absmin + vec2(m1) + '-1 -1 0', it.absmax + vec2(m2) + '1 1 0'))
                {
                        vector top = org;
                        top.z = it.absmax.z + (PL_MAX_CONST.z - PL_MIN_CONST.z);
index b2597ebd0422ad7217468f6f11be7cab1406be0a..88ea34de221213c563f1d503b82c6837c3046349 100644 (file)
@@ -647,7 +647,7 @@ void waypoint_spawn_fromeditor(entity pl, bool at_crosshair, bool is_jump_wp, bo
                        e = it; break;
                });
                if (!e)
-                       e = waypoint_spawn(jp.absmin - PL_MAX_CONST, jp.absmax - PL_MIN_CONST, WAYPOINTFLAG_TELEPORT);
+                       e = waypoint_spawn(jp.absmin - PL_MAX_CONST + '1 1 1', jp.absmax - PL_MIN_CONST + '-1 -1 -1', WAYPOINTFLAG_TELEPORT);
                if (!pl.wp_locked)
                        pl.wp_locked = e;
        }
@@ -2062,7 +2062,7 @@ void waypoint_spawnforteleporter_wz(entity e, entity tracetest_ent)
 void waypoint_spawnforteleporter(entity e, vector destination, float timetaken, entity tracetest_ent)
 {
        destination = waypoint_fixorigin(destination, tracetest_ent);
-       waypoint_spawnforteleporter_boxes(e, WAYPOINTFLAG_TELEPORT, e.absmin - PL_MAX_CONST, e.absmax - PL_MIN_CONST, destination, destination, timetaken);
+       waypoint_spawnforteleporter_boxes(e, WAYPOINTFLAG_TELEPORT, e.absmin - PL_MAX_CONST + '1 1 1', e.absmax - PL_MIN_CONST + '-1 -1 -1', destination, destination, timetaken);
 }
 
 entity waypoint_spawnpersonal(entity this, vector position)
index c05f052ec257b6e3e4f009cfd6b80212c91e260b..03404ebf4555482d04ad7fe4047a7a248f02eb41 100644 (file)
@@ -403,10 +403,20 @@ set timelimit_decrement 5 "number of minutes removed from the timer when voting
 set timelimit_min 5 "shortest match time achieveable with reducematchtime and timelimit votes"
 set timelimit_max 60 "maximum match time achieveable with extendmatchtime and timelimit votes"
 
+sv_gameplayfix_delayprojectiles 0
+sv_gameplayfix_q2airaccelerate 1
+sv_gameplayfix_stepmultipletimes 1
+sv_gameplayfix_stepdown 2
+// only available in qc physics
+set sv_gameplayfix_stepdown_maxspeed 0 "maximum speed walking entities can be moving for stepping down to apply"
+
 // delay for "kill" to prevent abuse
 set g_balance_kill_delay 2 "timer before death when using the kill command"
 set g_balance_kill_antispam 5 "additional time added to the kill delay if used repeatedly"
 
+// this feature is currently buggy in the engine (it appears to PREVENT any dropping in lots of maps, leading to weirdly aligned entities, and in some cases even CAUSES them to drop through solid, like in facing worlds nex)
+sv_gameplayfix_droptofloorstartsolid 0
+
 set sv_foginterval 1 "force enable fog in regular intervals"
 
 set sv_maxidle 0 "kick players idle for more than this amount of time in seconds"
@@ -487,17 +497,6 @@ set debug_text_3d_default_align 0 "Default text alignment for debug_text_3d()"
 set debug_text_3d_default_duration 10 "Default duration for debug_text_3d()"
 set debug_text_3d_default_velocity "0 -10 0" "Default velocity for debug_text_3d() in screen coords (X and Y from top left)"
 
-sv_gameplayfix_delayprojectiles 0
-sv_gameplayfix_q2airaccelerate 1
-sv_gameplayfix_stepmultipletimes 1
-sv_gameplayfix_stepdown 2
-
-// only available in qc physics
-set sv_gameplayfix_stepdown_maxspeed 0 "maximum speed walking entities can be moving for stepping down to apply"
-
-// this feature is currently buggy in the engine (it appears to PREVENT any dropping in lots of maps, leading to weirdly aligned entities, and in some cases even CAUSES them to drop through solid, like in facing worlds nex)
-sv_gameplayfix_droptofloorstartsolid 0
-
 // otherwise, antilag breaks
 sv_gameplayfix_consistentplayerprethink 1
 
@@ -505,9 +504,6 @@ sv_gameplayfix_consistentplayerprethink 1
 sv_gameplayfix_gravityunaffectedbyticrate 1
 sv_gameplayfix_nogravityonground 1
 
-// avoid needing to work around Quake bbox expansion in many places
-sv_legacy_bbox_expand 0
-
 set sv_q3compat_changehitbox 0 "use Q3 player hitbox dimensions and camera height on Q3 maps (maps with an entry in a .arena or .defi file)"
 
 set g_movement_highspeed 1 "multiplier scale for movement speed (applies to sv_maxspeed and sv_maxairspeed, also applies to air acceleration when g_movement_highspeed_q3_compat is set to 0)"