Merge remote-tracking branch 'origin/terencehill/moveplayer_fix'

# By terencehill
# Via terencehill
* origin/terencehill/moveplayer_fix:
  CheckAllowedTeams must be called before FindSmallestTeam

diff --git a/physicsX.cfg b/physicsX.cfg
index 54955371bfba11cc8e98fdb77a26e14fdb4c3d46..c90020fdfabac73874fc3abbe6c98e5e443247d0 100644 (file)
--- a/physicsX.cfg
+++ b/physicsX.cfg
@@ -1,7 +1,7 @@
 g_mod_physics Xonotic
 // current Xonotic physics
 
-sv_gravity 700
+sv_gravity 720
 sv_maxspeed 360
 sv_maxairspeed 360
 
@@ -16,13 +16,15 @@ sv_stepheight 31
 // Xon 0.7: 24+2
 // Samual: 31 (just below 32, keeping things smooth without allowing 32qu steps)
 
+// jump duration == 2*sv_jumpvelocity / sv_gravity
+// in this case: 0.6888888888 (thus either 20 or 21 frames)
 // jump height == sv_jumpvelocity^2 / (2*sv_gravity)
-// in this case: 42.87 qu
+// in this case: 42.71
 // player: 24+45 qu
-// total: 111.87qu
+// total: 111.71qu
 // this is smaller than 112 qu, so a 112 qu high corridor (7 of 8 grid units in
 // the 16 grid, and the 8th unit used for wall/floor) just lets a player jump!
-sv_jumpvelocity 245
+sv_jumpvelocity 248
 sv_wateraccelerate -1
 sv_waterfriction -1
 sv_airaccel_sideways_friction 0

diff --git a/qcsrc/server/teamplay.qc b/qcsrc/server/teamplay.qc
index 2a1fb2e2f8475a7dc791c57c05d961e4e6dc304f..e332e55ed80de06b3b4ce73e6fa2f063d1f4d8d0 100644 (file)
--- a/qcsrc/server/teamplay.qc
+++ b/qcsrc/server/teamplay.qc
@@ -290,7 +290,7 @@ string getwelcomemessage(void)
        }
        if(autocvar_g_start_weapon_laser == 0)
                modifications = strcat(modifications, ", No start weapons");
-       if(autocvar_sv_gravity < 800)
+       if(cvar("sv_gravity") < stof(cvar_defstring("sv_gravity")))
                modifications = strcat(modifications, ", Low gravity");
        if(g_cloaked && !g_cts)
                modifications = strcat(modifications, ", Cloaked");