Patches #1979

xonotic-data.pk3dir:Mario/round_jump_fix: a S merge request: Fixes players being able to jump before a round starts.

Added by git-manager 3 months ago. Updated 3 months ago.

Status:ResolvedStart date:05/30/2014
Priority:NormalDue date:
Assignee:-% Done:

100%

Category:-
Target version:-

Description

Fixes players being able to jump before a round starts.

Repository: xonotic/xonotic-data.pk3dir.git
Commit: c65ee59d29b2193d913dccd320029aa110a6620a
Branch: Mario/round_jump_fix

Merge commands:

cd data/xonotic-data.pk3dir
git checkout master
git reset --hard origin/master
git pull && git diff 'c65ee59d29b2193d913dccd320029aa110a6620a'..'origin/Mario/round_jump_fix'

# please check that the diff you just saw did not contain anything complex that
# needs a new merge request, and review these changes

git merge --edit --log --no-ff 'origin/Mario/round_jump_fix'

# please make sure this merge worked, and if not, fix merge conflicts and git
# commit BEFORE the next command
#
# also, THIS is the point to do final pre-merge testing
#
# use git reset --hard origin/master to bail out

git push && git push --delete origin 'Mario/round_jump_fix'

Diffstat:

 qcsrc/server/cl_physics.qc |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

Revision log:

commit c65ee59d29b2193d913dccd320029aa110a6620a
Author: Mario <mario.mario@y7mail.com>
Commit: Mario <mario.mario@y7mail.com>

    Disable jumping while player is blocked, they can't move so jumping is weird and unpredicted

User agreed to the license.

Diff:

diff --git a/qcsrc/server/cl_physics.qc b/qcsrc/server/cl_physics.qc
index 0d0dd31..43c7be5 100644
--- a/qcsrc/server/cl_physics.qc
+++ b/qcsrc/server/cl_physics.qc
@@ -19,6 +19,9 @@ When you press the jump key
 */
 void PlayerJump (void)
 {
+    if(self.player_blocked)
+        return; // no jumping while blocked
+
     float doublejump = FALSE;

     player_multijump = doublejump;

History

#1 Updated by terencehill 3 months ago

I think that letting players jump when the game isn't started yet is harmless and somehow funny (you have something to do while waiting). I made this change long time ago just for that reason.
Anyway, I don't care too much about it...

#2 Updated by divVerent 3 months ago

  • Status changed from New to Resolved
  • % Done changed from 0 to 100

Don't like it (the underlying issue seems elsewhere), but it doesn't hurt so... done.

Also available in: Atom PDF