X-Git-Url: http://git.xonotic.org/?a=blobdiff_plain;ds=sidebyside;f=data%2Fqcsrc%2Fserver%2Fcl_client.qc;h=3b4afbc550cecae97cca0c537d319c4cc66b8e3f;hb=dec59284d2680f03706822b2b94067cbb10d9813;hp=33406554dd2ac92b7a0780b3b54c26205b6719ee;hpb=0cd4ae2a1544f1e31319404b5dc9b1fad363b9ea;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 33406554..3b4afbc5 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -543,7 +543,12 @@ float Client_customizeentityforclient()
 	Client_setmodel(setmodel_state());
 	self.effects &~= EF_NODEPTHTEST;
 	if not(self.stat_eaten)
+	{
 		self.alpha = default_player_alpha;
+		if(cvar("g_vore_swallowfade"))
+		if not(other == self && !chase)
+			self.alpha *= 1 - self.swallow_progress_prey; // fade players out as they are swallowed, to better simulate their disappearing
+	}
 	else if(cvar("g_vore_neighborprey_distance") && self.predator == other.predator && !(chase || other.classname == "observer"))
 	{
 		self.alpha = default_player_alpha; // allow seeing neighboring prey
@@ -581,13 +586,6 @@ void PutObserverInServer (void)
 	}
 
 	Vore_Disconnect();
-	entity e;
-	for(e = world; (e = find(e, classname, "consumable")); )
-	{
-		// remove consumable items when we spectate
-		if(e.predator == self)
-			Item_Consumable_Remove(e, TRUE);
-	}
 
 	kh_Key_DropAll(self, TRUE);
 
@@ -858,12 +856,6 @@ void PutClientInServer (void)
 
 		Vore_Disconnect();
 		self.swallow_progress_pred = self.swallow_progress_prey = 0;
-		for(e = world; (e = find(e, classname, "consumable")); )
-		{
-			// remove consumable items when we respawn
-			if(e.predator == self)
-				Item_Consumable_Remove(e, FALSE);
-		}
 
 		self.classname = "player";
 		self.wasplayer = TRUE;
@@ -1388,6 +1380,7 @@ void FixClientCvars(entity e)
 	stuffcmd(e, strcat("cl_movement_maxairspeed ", ftos(cvar("sv_maxairspeed")), "\n"));
 	stuffcmd(e, strcat("cl_movement_stopspeed ", ftos(cvar("sv_stopspeed")), "\n"));
 	stuffcmd(e, strcat("cl_movement_jumpvelocity ", ftos(cvar("sv_jumpvelocity")), "\n"));
+	stuffcmd(e, strcat("cl_movement_crouchvelocity ", ftos(cvar("sv_crouchvelocity")), "\n"));
 	stuffcmd(e, strcat("cl_movement_stepheight ", ftos(cvar("sv_stepheight")), "\n"));
 	stuffcmd(e, strcat("set cl_movement_friction_on_land ", ftos(cvar("sv_friction_on_land")), "\n"));
 	stuffcmd(e, strcat("set cl_movement_airaccel_qw ", ftos(cvar("sv_airaccel_qw")), "\n"));
@@ -1633,13 +1626,6 @@ void ClientDisconnect (void)
 	}
 
 	Vore_Disconnect();
-	entity e;
-	for(e = world; (e = find(e, classname, "consumable")); )
-	{
-		// remove consumable items when we disconnect
-		if(e.predator == self)
-			Item_Consumable_Remove(e, TRUE);
-	}
 
 	CheatShutdownClient();
 
@@ -2367,7 +2353,7 @@ void SetPlayerSize()
 		{
 			//setsize (self, PL_MIN * self.scale, PL_MAX * self.scale);
 			if(!self.stat_eaten)
-				self.view_ofs = PL_VIEW_OFS * self.scale;
+				self.view_ofs = PL_VIEW_OFS * pow(self.scale, cvar("g_healthsize_viewfactor"));
 		}
 
 		self.last_alive_scale = self.scale;