]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Remove the stat for it (doesn't fix jumppad compatibility)
authorMario <zacjardine@y7mail.com>
Sat, 15 Sep 2018 19:32:21 +0000 (05:32 +1000)
committerMario <zacjardine@y7mail.com>
Sat, 15 Sep 2018 19:32:21 +0000 (05:32 +1000)
qcsrc/common/mapobjects/trigger/jumppads.qc
qcsrc/common/stats.qh
qcsrc/server/autocvars.qh

index b32b4d262d90885ece07a79c95727c8298d1c69c..5ffdf2d1066085d9bd47fd1dd5d541af179b4671 100644 (file)
@@ -334,8 +334,7 @@ bool trigger_push_test(entity this, entity item)
 {
        // first calculate a typical start point for the jump
        vector org = (this.absmin + this.absmax) * 0.5;
-       if(!STAT(VQ3COMPAT))
-               org.z = this.absmax.z - PL_MIN_CONST.z - 7;
+       org.z = this.absmax.z - PL_MIN_CONST.z - 7;
 
        if (this.target)
        {
index 369042b77daac1f2272c01337b53b7cfa9fe295d..9b8f04041780fd55f707331540c74ab99b0e8e88 100644 (file)
@@ -301,11 +301,6 @@ bool autocvar_sv_slick_applygravity;
 #endif
 REGISTER_STAT(SLICK_APPLYGRAVITY, bool, autocvar_sv_slick_applygravity)
 
-#ifdef SVQC
-bool autocvar_sv_vq3compat;
-#endif
-REGISTER_STAT(VQ3COMPAT, bool, autocvar_sv_vq3compat)
-
 #ifdef SVQC
 #include "physics/movetypes/movetypes.qh"
 float warmup_limit;
index 4e180f731b2acd7d95efb8e74ba75b091f47f4c8..2d19f6f9ab83c2d19a1bf90a50427f5d2d319f9c 100644 (file)
@@ -316,6 +316,7 @@ string autocvar_sv_motd;
 bool autocvar_sv_precacheplayermodels;
 //float autocvar_sv_precacheweapons; // WEAPONTODO?
 bool autocvar_sv_q3acompat_machineshotgunswap;
+bool autocvar_sv_vq3compat;
 bool autocvar_sv_servermodelsonly;
 int autocvar_sv_spectate;
 float autocvar_sv_spectator_speed_multiplier;