X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=60f331bb30570d85ec1ce9e8110e004d6014a751;hp=e0b7e116eae253a3b6f85f3dc43e352b69774f99;hb=a47688cb559bcb2090d69a3a3c0c92d4d8fe02d5;hpb=b7d3af12c0f5d48a6f2a421c958f84079b9cbbdd

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index e0b7e116ea..60f331bb30 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -269,7 +269,7 @@ void PutObserverInServer(entity this)
 	this.health = FRAGS_SPECTATOR;
 	this.takedamage = DAMAGE_NO;
 	this.solid = SOLID_NOT;
-	this.movetype = MOVETYPE_FLY_WORLDONLY; // user preference is controlled by playerprethink
+	set_movetype(this, MOVETYPE_FLY_WORLDONLY); // user preference is controlled by playerprethink
 	this.flags = FL_CLIENT | FL_NOTARGET;
 	this.armorvalue = 666;
 	this.effects = 0;
@@ -481,7 +481,7 @@ void PutClientInServer(entity this)
 		this.iscreature = true;
 		this.teleportable = TELEPORT_NORMAL;
 		this.damagedbycontents = true;
-		this.movetype = MOVETYPE_WALK;
+		set_movetype(this, MOVETYPE_WALK);
 		this.solid = SOLID_SLIDEBOX;
 		this.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID;
 		if (autocvar_g_playerclip_collisions)
@@ -1289,7 +1289,7 @@ void respawn(entity this)
 	{
 		this.solid = SOLID_NOT;
 		this.takedamage = DAMAGE_NO;
-		this.movetype = MOVETYPE_FLY;
+		set_movetype(this, MOVETYPE_FLY);
 		this.velocity = '0 0 1' * autocvar_g_respawn_ghosts_speed;
 		this.avelocity = randomvec() * autocvar_g_respawn_ghosts_speed * 3 - randomvec() * autocvar_g_respawn_ghosts_speed * 3;
 		this.effects |= CSQCMODEL_EF_RESPAWNGHOST;
@@ -1615,7 +1615,7 @@ void SpectateCopy(entity this, entity spectatee)
 	this.angles = spectatee.v_angle;
 	STAT(FROZEN, this) = STAT(FROZEN, spectatee);
 	this.revive_progress = spectatee.revive_progress;
-	if(!PHYS_INPUT_BUTTON_USE(this))
+	if(!PHYS_INPUT_BUTTON_USE(this) && STAT(CAMERA_SPECTATOR, this) != 2)
 		this.fixangle = true;
 	setorigin(this, spectatee.origin);
 	setsize(this, spectatee.mins, spectatee.maxs);
@@ -1675,7 +1675,7 @@ bool SpectateSet(entity this)
 	msg_entity = this;
 	WriteByte(MSG_ONE, SVC_SETVIEW);
 	WriteEntity(MSG_ONE, this.enemy);
-	this.movetype = MOVETYPE_NONE;
+	set_movetype(this, MOVETYPE_NONE);
 	accuracy_resend(this);
 
 	if(!SpectateUpdate(this))
@@ -1925,7 +1925,6 @@ void ObserverThink(entity this)
 		MinigameImpulse(this, this.impulse);
 		this.impulse = 0;
 	}
-	float prefered_movetype;
 	if (this.flags & FL_JUMPRELEASED) {
 		if (PHYS_INPUT_BUTTON_JUMP(this) && !this.version_mismatch) {
 			this.flags &= ~FL_JUMPRELEASED;
@@ -1936,9 +1935,8 @@ void ObserverThink(entity this)
 				TRANSMUTE(Spectator, this);
 			}
 		} else {
-			prefered_movetype = ((!PHYS_INPUT_BUTTON_USE(this) ? this.cvar_cl_clippedspectating : !this.cvar_cl_clippedspectating) ? MOVETYPE_FLY_WORLDONLY : MOVETYPE_NOCLIP);
-			if (this.movetype != prefered_movetype)
-				this.movetype = prefered_movetype;
+			int preferred_movetype = ((!PHYS_INPUT_BUTTON_USE(this) ? this.cvar_cl_clippedspectating : !this.cvar_cl_clippedspectating) ? MOVETYPE_FLY_WORLDONLY : MOVETYPE_NOCLIP);
+			set_movetype(this, preferred_movetype);
 		}
 	} else {
 		if (!(PHYS_INPUT_BUTTON_ATCK(this) || PHYS_INPUT_BUTTON_JUMP(this))) {
@@ -1959,6 +1957,13 @@ void SpectatorThink(entity this)
 	{
 		if(MinigameImpulse(this, this.impulse))
 			this.impulse = 0;
+
+		if (this.impulse == IMP_weapon_drop.impulse)
+		{
+			STAT(CAMERA_SPECTATOR, this) = (STAT(CAMERA_SPECTATOR, this) + 1) % 3;
+			this.impulse = 0;
+			return;
+		}
 	}
 	if (this.flags & FL_JUMPRELEASED) {
 		if (PHYS_INPUT_BUTTON_JUMP(this) && !this.version_mismatch) {
@@ -2281,6 +2286,8 @@ void PlayerPreThink (entity this)
         .entity weaponentity = weaponentities[0]; // TODO: unhardcode
 		if (this.hook.state) {
 			do_crouch = false;
+		} else if (this.waterlevel >= WATERLEVEL_SWIMMING) {
+			do_crouch = false;
 		} else if (this.vehicle) {
 			do_crouch = false;
 		} else if (STAT(FROZEN, this)) {
@@ -2418,6 +2425,30 @@ void DrownPlayer(entity this)
 	}
 }
 
+void Player_Physics(entity this)
+{
+	this.movetype = ((this.move_qcphysics) ? MOVETYPE_NONE : this.move_movetype);
+
+	if(!this.move_qcphysics)
+		return;
+
+	int mt = this.move_movetype;
+
+	if(mt == MOVETYPE_PUSH || mt == MOVETYPE_FAKEPUSH || mt == MOVETYPE_PHYSICS)
+	{
+		this.move_qcphysics = false;
+		this.movetype = mt;
+		return;
+	}
+
+	if(!frametime && !this.pm_frametime)
+		return;
+
+	Movetype_Physics_NoMatchTicrate(this, this.pm_frametime, true);
+
+	this.pm_frametime = 0;
+}
+
 /*
 =============
 PlayerPostThink
@@ -2428,6 +2459,8 @@ Called every frame for each client after the physics are run
 .float idlekick_lasttimeleft;
 void PlayerPostThink (entity this)
 {
+	Player_Physics(this);
+
 	if (sv_maxidle > 0)
 	if (frametime) // WORKAROUND: only use dropclient in server frames (frametime set). Never use it in cl_movement frames (frametime zero).
 	if (IS_REAL_CLIENT(this))