Merge branch 'TimePath/cleanup'

diff --combined qcsrc/common/physics.qc
index cb823b1074c8ee19ed2048831b5e2b7f5d82cb89,731cba8ed45c912bb35b409be792f2ffe15f77bb..54a7002056f9b681e4a741034ec24656911a6742
--- 1/qcsrc/common/physics.qc
--- 2/qcsrc/common/physics.qc
+++ b/qcsrc/common/physics.qc
@@@ -1,6 -1,5 +1,5 @@@
  #include "physics.qh"
- #include "triggers/trigger/swamp.qh"
- #include "triggers/trigger/jumppads.qh"
+ #include "triggers/include.qh"
  #include "viewloc.qh"
  
  #ifdef SVQC
@@@ -11,14 -10,7 +10,7 @@@
  // client side physics
  bool Physics_Valid(string thecvar)
  {
-       if(!autocvar_g_physics_clientselect) { return false; }
- 
-       string l = strcat(" ", autocvar_g_physics_clientselect_options, " ");
- 
-       if(strstrofs(l, strcat(" ", thecvar, " "), 0) >= 0)
-               return true;
- 
-       return false;
+       return autocvar_g_physics_clientselect && strhasword(autocvar_g_physics_clientselect_options, thecvar);
  }
  
  float Physics_ClientOption(entity pl, string option)
@@@ -78,8 -70,7 +70,8 @@@ void Physics_AddStats(
        addstat(STAT_JETPACK_MAXSPEED_SIDE, AS_FLOAT, stat_jetpack_maxspeed_side);
  
        // hack to fix track_canjump
 -      addstat(STAT_MOVEVARS_TRACK_CANJUMP, AS_INT, cvar_cl_movement_track_canjump);
 +      addstat(STAT_MOVEVARS_CL_TRACK_CANJUMP, AS_INT, cvar_cl_movement_track_canjump);
 +      addstat(STAT_MOVEVARS_TRACK_CANJUMP, AS_INT, stat_sv_track_canjump);
  
        // double jump
        addstat(STAT_DOUBLEJUMP, AS_INT, stat_doublejump);
@@@ -176,8 -167,6 +168,8 @@@ void Physics_UpdateStats(float maxspd_m
        self.stat_sv_airstopaccelerate = Physics_ClientOption(self, "airstopaccelerate");
        self.stat_sv_jumpvelocity = Physics_ClientOption(self, "jumpvelocity");
  
 +      self.stat_sv_track_canjump = Physics_ClientOption(self, "track_canjump");
 +
        self.stat_gameplayfix_upvelocityclearsonground = UPWARD_VELOCITY_CLEARS_ONGROUND;
  }
  #endif
@@@ -594,11 -583,7 +586,11 @@@ bool PlayerJump (void
                if (!IS_ONGROUND(self))
                        return IS_JUMP_HELD(self);
  
 -      if (PHYS_TRACK_CANJUMP(self))
 +      bool track_jump = PHYS_CL_TRACK_CANJUMP(self);
 +      if(PHYS_TRACK_CANJUMP(self))
 +              track_jump = true;
 +
 +      if (track_jump)
                if (IS_JUMP_HELD(self))
                        return true;