X-Git-Url: https://git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fserver%2Fcl_client.qc;h=35b7128cb38c082524b24e7ac994dd321b15dbda;hb=54f4843b201d2b22942457df5b50ddc0c48ed8d2;hp=33b1fd05aa09d251a2b6211634bc107033d772f8;hpb=e1ea927fc5c54d8a78429373cd4877a6d316dd12;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/server/cl_client.qc b/qcsrc/server/cl_client.qc
index 33b1fd05a..35b7128cb 100644
--- a/qcsrc/server/cl_client.qc
+++ b/qcsrc/server/cl_client.qc
@@ -2666,10 +2666,6 @@ void PlayerPreThink (void)
 
 		if(frametime)
 		{
-#ifndef NO_LEGACY_NETWORKING
-			self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
-#endif
-
 			if(self.weapon == WEP_NEX && autocvar_g_balance_nex_charge)
 			{
 				self.weaponentity_glowmod_x = autocvar_g_weapon_charge_colormod_hdrmultiplier * autocvar_g_weapon_charge_colormod_red_half * min(1, self.nex_charge / autocvar_g_balance_nex_charge_animlimit);
@@ -2796,8 +2792,19 @@ void PlayerPreThink (void)
 
 		self.prevorigin = self.origin;
 
-		if (!self.vehicle)
-		if (((self.BUTTON_CROUCH && !self.hook.state) || self.health <= g_bloodloss) && self.animstate_startframe != self.anim_melee_x && !self.freezetag_frozen) // prevent crouching if using melee attack
+		float do_crouch = self.BUTTON_CROUCH;
+		if(self.hook.state)
+			do_crouch = 0;
+		if(self.health <= g_bloodloss)
+			do_crouch = 1;
+		if(self.vehicle)
+			do_crouch = 0;
+		if(self.freezetag_frozen)
+			do_crouch = 0;
+		if(self.weapon == WEP_SHOTGUN && self.weaponentity.wframe == WFRAME_FIRE2 && time < self.weapon_nextthink)
+			do_crouch = 0;
+
+		if (do_crouch)
 		{
 			if (!self.crouch)
 			{
@@ -2960,18 +2967,6 @@ Called every frame for each client after the physics are run
 =============
 */
 .float idlekick_lasttimeleft;
-.entity showheadshotbbox;
-void showheadshotbbox_think()
-{
-	if(self.owner.showheadshotbbox != self)
-	{
-		remove(self);
-		return;
-	}
-	self.nextthink = time;
-	setorigin(self, self.owner.origin);
-	setsize(self, GetHeadshotMins(self.owner), GetHeadshotMaxs(self.owner));
-}
 void PlayerPostThink (void)
 {
 	// Savage: Check for nameless players
@@ -3056,27 +3051,6 @@ void PlayerPostThink (void)
 	if(self.waypointsprite_attachedforcarrier)
 		WaypointSprite_UpdateHealth(self.waypointsprite_attachedforcarrier, '1 0 0' * healtharmor_maxdamage(self.health, self.armorvalue, autocvar_g_balance_armor_blockpercent));
 
-	if(self.classname == "player" && self.deadflag == DEAD_NO && autocvar_r_showbboxes)
-	{
-		if(!self.showheadshotbbox)
-		{
-			self.showheadshotbbox = spawn();
-			self.showheadshotbbox.classname = "headshotbbox";
-			self.showheadshotbbox.owner = self;
-			self.showheadshotbbox.think = showheadshotbbox_think;
-			self.showheadshotbbox.nextthink = time;
-			self = self.showheadshotbbox;
-			self.think();
-			self = self.owner;
-		}
-	}
-	else
-	{
-		if(self.showheadshotbbox)
-			if(self.showheadshotbbox && !wasfreed(self.showheadshotbbox))
-                remove(self.showheadshotbbox);
-	}
-
 	playerdemo_write();
 
 	if((g_cts || g_race) && self.cvar_cl_allow_uidtracking == 1 && self.cvar_cl_allow_uid2name == 1)