X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_client.qc;h=69404cb855267f1d807420b5d3d3622b6083b3dc;hb=a59798ff492b6bb761c12d8c3e97dad25d236cd4;hp=0f8057656039549adea22e0f25273c7fe215df36;hpb=73e70f5165785aaf977580cba06754574a3f72c7;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 0f805765..69404cb8 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -530,8 +530,10 @@ float Client_customizeentityforclient()
 	Client_setmodel(setmodel_state());
 	if not(self.stat_eaten || self.fakeprey)
 		self.alpha = default_player_alpha;
+	else if(cvar("g_vore_neighborprey_distance") && (self.predator == other.predator || self.predator == other.fakepredator) && self != other && !(other.cvar_chase_active || other.classname == "observer"))
+		self.alpha = default_player_alpha; // allow seeing neighboring prey
 	else
-		self.alpha = -1; // hide all prey
+		self.alpha = -1; // hide prey
 	return TRUE;
 }
 
@@ -2275,30 +2277,36 @@ float vercmp(string v1, string v2)
 	return vercmp_recursive(v1, v2);
 }
 
-void ApplyHealthSize()
+void SetPlayerSize()
 {
-	// change player scale based on the amount of health we have
-
-	if not(cvar("g_healthsize"))
-		return;
+	if(cvar("g_healthsize"))
+	{
+		// change player scale based on the amount of health we have
 
-	self.scale = bound(cvar("g_healthsize_min"), self.health, cvar("g_healthsize_max")) / cvar("g_healthsize");
+		self.scale = bound(cvar("g_healthsize_min"), self.health, cvar("g_healthsize_max")) / cvar("g_healthsize");
 
-	// The following code sets the bounding box to match the player's size.
-	// It is currently disabled because of issues with engine movement prediction (cl_movement).
-	// The engine expects the bounding box to be default size, and changing it will cause glitches.
-	// This code may be enabled once the engine has the ability to use different bbox sizes for movement prediction.
-	if(self.crouch)
-	{
-		//setsize (self, PL_CROUCH_MIN * self.scale, PL_CROUCH_MAX * self.scale);
-		if(!self.stat_eaten)
-			self.view_ofs = PL_CROUCH_VIEW_OFS * self.scale;
+		// The following code sets the bounding box to match the player's size.
+		// It is currently disabled because of issues with engine movement prediction (cl_movement).
+		// The engine expects the bounding box to be default size, and changing it will cause glitches.
+		// This code may be enabled once the engine has the ability to use different bbox sizes for movement prediction.
+		if(self.crouch)
+		{
+			//setsize (self, PL_CROUCH_MIN * self.scale, PL_CROUCH_MAX * self.scale);
+			if(!self.stat_eaten)
+				self.view_ofs = PL_CROUCH_VIEW_OFS * self.scale;
+		}
+		else
+		{
+			//setsize (self, PL_MIN * self.scale, PL_MAX * self.scale);
+			if(!self.stat_eaten)
+				self.view_ofs = PL_VIEW_OFS * self.scale;
+		}
 	}
-	else
+
+	if(self.stat_eaten && cvar("g_vore_neighborprey_distance"))
 	{
-		//setsize (self, PL_MIN * self.scale, PL_MAX * self.scale);
-		if(!self.stat_eaten)
-			self.view_ofs = PL_VIEW_OFS * self.scale;
+		// resize prey if neighborprey is enabled
+		self.scale *= cvar("g_vore_neighborprey_scale");
 	}
 }
 
@@ -2624,7 +2632,7 @@ void PlayerPreThink (void)
 			}
 		}
 
-		ApplyHealthSize();
+		SetPlayerSize();
 
 		FixPlayermodel();