From: Martin Taibr <taibr.martin@gmail.com>
Date: Mon, 19 Feb 2018 08:58:31 +0000 (+0100)
Subject: Merge branch 'master' into martin-t/uncrustify
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=6317faf49d3c92fffe52f790ff39b6792fbfe458;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into martin-t/uncrustify
---

6317faf49d3c92fffe52f790ff39b6792fbfe458
diff --cc qcsrc/common/viewloc.qc
index e20b660e5,e4e5ba991..27cc849da
--- a/qcsrc/common/viewloc.qc
+++ b/qcsrc/common/viewloc.qc
@@@ -49,13 -50,15 +50,15 @@@ void viewloc_PlayerPhysics(entity this
  		}
  
  		//if(!PHYS_INPUT_BUTTON_CROUCH(this) && !IS_DUCKED(this))
+ 		if(!(this.viewloc.spawnflags & VIEWLOC_FREEMOVE))
+ 		{
  #ifdef SVQC
  			//PHYS_INPUT_BUTTON_CROUCH(this) = (old_movement_x < 0);
 -			if (old_movement.x < 0)
 +			if (old_movement.x < 0) {
  				PHYS_INPUT_BUTTON_CROUCH(this) = true;
 +			}
  #elif defined(CSQC)
 -			if (old_movement.x < 0)
 -			{
 +			if (old_movement.x < 0) {
  				input_buttons |= BIT(4);
  				this.flags |= FL_DUCKED;
  			}