moved many cl_ prefixed variables into cl. or cls.

[xonotic/darkplaces.git] / sv_phys.c

diff --git a/sv_phys.c b/sv_phys.c
index 4e17bc92d5907a43bc7f4660aab542b3d8a98df9..12f9b303e6b67cffd382faf006cd873d6ef69061 100644 (file)
--- a/sv_phys.c
+++ b/sv_phys.c
@@ -45,7 +45,7 @@ cvar_t sv_gravity = {CVAR_NOTIFY, "sv_gravity","800", "how fast you fall (512 =
 cvar_t sv_maxvelocity = {CVAR_NOTIFY, "sv_maxvelocity","2000", "universal speed limit on all entities"};
 cvar_t sv_nostep = {CVAR_NOTIFY, "sv_nostep","0", "prevents MOVETYPE_STEP entities (monsters) from moving"};
 cvar_t sv_stepheight = {CVAR_NOTIFY, "sv_stepheight", "18", "how high you can step up (TW_SV_STEPCONTROL extension)"};
-cvar_t sv_jumpstep = {CVAR_NOTIFY, "sv_jumpstep", "1", "whether you can step up while jumping (sv_gameplayfix_stepwhilejumping must also be 1)"};
+cvar_t sv_jumpstep = {CVAR_NOTIFY, "sv_jumpstep", "0", "whether you can step up while jumping (sv_gameplayfix_stepwhilejumping must also be 1)"};
 cvar_t sv_wallfriction = {CVAR_NOTIFY, "sv_wallfriction", "1", "how much you slow down when sliding along a wall"};
 cvar_t sv_newflymove = {CVAR_NOTIFY, "sv_newflymove", "0", "enables simpler/buggier player physics (not recommended)"};
 cvar_t sv_freezenonclients = {CVAR_NOTIFY, "sv_freezenonclients", "0", "freezes time, except for players, allowing you to walk around and take screenshots of explosions"};
@@ -1124,6 +1124,9 @@ void SV_WalkMove (prvm_edict_t *ent)
 
        if (downtrace.fraction < 1 && downtrace.plane.normal[2] > 0.7)
        {
+               // this has been disabled so that you can't jump when you are stepping
+               // up while already jumping (also known as the Quake2 stair jump bug)
+#if 0
                // LordHavoc: disabled this check so you can walk on monsters/players
                //if (ent->fields.server->solid == SOLID_BSP)
                {
@@ -1131,6 +1134,7 @@ void SV_WalkMove (prvm_edict_t *ent)
                        ent->fields.server->flags =     (int)ent->fields.server->flags | FL_ONGROUND;
                        ent->fields.server->groundentity = PRVM_EDICT_TO_PROG(downtrace.ent);
                }
+#endif
        }
        else
        {