From: Mario <mario@smbclan.net>
Date: Thu, 8 Mar 2018 05:33:47 +0000 (+1000)
Subject: Merge branch 'master' into Mario/crouch
X-Git-Tag: xonotic-v0.8.5~2199^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f20db00cafb75a05d5a4ee80957d3d8b351eddea;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into Mario/crouch

# Conflicts:
#	qcsrc/common/physics/player.qc
#	qcsrc/server/client.qc
---

f20db00cafb75a05d5a4ee80957d3d8b351eddea
diff --cc qcsrc/common/physics/player.qc
index 14981df2e,351725bc1..1b8065502
--- a/qcsrc/common/physics/player.qc
+++ b/qcsrc/common/physics/player.qc
@@@ -101,48 -101,39 +101,48 @@@ void PM_ClientMovement_UpdateStatus(ent
  	if(!IS_PLAYER(this))
  		return;
  
 -	// set crouched
 -	bool do_crouch = PHYS_INPUT_BUTTON_CROUCH(this);
 +	bool have_hook = false;
  	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
  	{
 -		entity wep = viewmodels[slot];
 -		if(wep.hook && !wasfreed(wep.hook))
 +	#if defined(CSQC)
 +		entity wepent = viewmodels[slot];
 +	#elif defined(SVQC)
 +		.entity weaponentity = weaponentities[slot];
 +		entity wepent = this.(weaponentity);
 +	#endif
 +		if(wepent.hook && !wasfreed(wepent.hook))
  		{
 -			do_crouch = false;
 -			break; // don't bother checking the others
 +			have_hook = true;
 +			break;
  		}
  	}
 -	//if(this.waterlevel >= WATERLEVEL_SWIMMING)
 +	bool do_crouch = PHYS_INPUT_BUTTON_CROUCH(this);
 +	if (have_hook) {
 +		do_crouch = false;
- 	} else if (this.waterlevel >= WATERLEVEL_SWIMMING) {
- 		do_crouch = false;
++	//} else if (this.waterlevel >= WATERLEVEL_SWIMMING) {
+ 		//do_crouch = false;
 -	if(hud != HUD_NORMAL)
 +	} else if (PHYS_INVEHICLE(this)) {
  		do_crouch = false;
 -	if(STAT(FROZEN, this))
 +	} else if (STAT(FROZEN, this)) {
  		do_crouch = false;
 -
 -	if (do_crouch)
 -	{
 -		// wants to crouch, this always works
 -		if (!IS_DUCKED(this)) SET_DUCKED(this);
 -	}
 -	else
 -	{
 -		// wants to stand, if currently crouching we need to check for a low ceiling first
 -		if (IS_DUCKED(this))
 -		{
 -			tracebox(this.origin, STAT(PL_MIN, this), STAT(PL_MAX, this), this.origin, MOVE_NORMAL, this);
 -			if (!trace_startsolid) UNSET_DUCKED(this);
 +    }
 +
 +	if (do_crouch) {
 +		if (!IS_DUCKED(this)) {
 +			SET_DUCKED(this);
 +			this.view_ofs = STAT(PL_CROUCH_VIEW_OFS, this);
 +			setsize(this, STAT(PL_CROUCH_MIN, this), STAT(PL_CROUCH_MAX, this));
 +			// setanim(this, this.anim_duck, false, true, true); // this anim is BROKEN anyway
  		}
 +	} else if (IS_DUCKED(this)) {
 +        tracebox(this.origin, STAT(PL_MIN, this), STAT(PL_MAX, this), this.origin, false, this);
 +        if (!trace_startsolid) {
 +            UNSET_DUCKED(this);
 +            this.view_ofs = STAT(PL_VIEW_OFS, this);
 +            setsize(this, STAT(PL_MIN, this), STAT(PL_MAX, this));
 +        }
  	}
 +#ifdef CSQC
  
  	if (IS_ONGROUND(this) || this.velocity.z <= 0 || PHYS_WATERJUMP_TIME(this) <= 0)
  		PHYS_WATERJUMP_TIME(this) = 0;
diff --cc qcsrc/server/client.qc
index f87a5b765,7a4f82fc5..918f38b2d
--- a/qcsrc/server/client.qc
+++ b/qcsrc/server/client.qc
@@@ -2239,8 -2246,50 +2246,13 @@@ bool PlayerThink(entity this
  		return false;
  	}
  
 -	bool have_hook = false;
 -	for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
 -	{
 -		.entity weaponentity = weaponentities[slot];
 -		if(this.(weaponentity).hook.state)
 -		{
 -			have_hook = true;
 -			break;
 -		}
 -	}
 -	bool do_crouch = PHYS_INPUT_BUTTON_CROUCH(this);
 -	if (have_hook) {
 -		do_crouch = false;
 -	//} else if (this.waterlevel >= WATERLEVEL_SWIMMING) {
 -		//do_crouch = false;
 -	} else if (this.vehicle) {
 -		do_crouch = false;
 -	} else if (STAT(FROZEN, this)) {
 -		do_crouch = false;
 -    }
 -
 -	if (do_crouch) {
 -		if (!this.crouch) {
 -			this.crouch = true;
 -			this.view_ofs = STAT(PL_CROUCH_VIEW_OFS, this);
 -			setsize(this, STAT(PL_CROUCH_MIN, this), STAT(PL_CROUCH_MAX, this));
 -			// setanim(this, this.anim_duck, false, true, true); // this anim is BROKEN anyway
 -		}
 -	} else if (this.crouch) {
 -        tracebox(this.origin, STAT(PL_MIN, this), STAT(PL_MAX, this), this.origin, false, this);
 -        if (!trace_startsolid) {
 -            this.crouch = false;
 -            this.view_ofs = STAT(PL_VIEW_OFS, this);
 -            setsize(this, STAT(PL_MIN, this), STAT(PL_MAX, this));
 -        }
 -	}
 -
  	FixPlayermodel(this);
  
+ 	if (this.shootfromfixedorigin != autocvar_g_shootfromfixedorigin) {
+ 		this.shootfromfixedorigin = autocvar_g_shootfromfixedorigin;
+ 		stuffcmd(this, sprintf("\ncl_shootfromfixedorigin \"%s\"\n", autocvar_g_shootfromfixedorigin));
+ 	}
+ 
  	// LordHavoc: allow firing on move frames (sub-ticrate), this gives better timing on slow servers
  	//if(frametime)
  	{