X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_client.qc;h=85138812266dc178a754a4cc478c7874d67d7446;hp=c26a5530cbeb73f436dee938ef2fc799e28accef;hb=3e17be488986726acf1f75df3562c2e1fa2e3294;hpb=08643f840d0ed0cca03e5810c0af02d28972ca08

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index c26a5530..85138812 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -528,8 +528,12 @@ float Client_customizeentityforclient()
 	}
 
 	Client_setmodel(setmodel_state());
-	if not(self.predator.classname == "player" || self.fakeprey)
+	if not(self.stat_eaten || self.fakeprey)
 		self.alpha = default_player_alpha;
+	else if(self.predator == other.predator && self != other && !(other.cvar_chase_active || other.classname == "observer"))
+		self.alpha = default_player_alpha;
+	else
+		self.alpha = -1; // hide all prey
 	return TRUE;
 }
 
@@ -827,6 +831,7 @@ void PutClientInServer (void)
 		RemoveGrabber(self); // Wazat's Grabber
 
 		Vore_DeadPrey_Detach(self);
+		self.fakeprey = FALSE; // clear the fakeprey status
 
 		self.classname = "player";
 		self.wasplayer = TRUE;
@@ -1609,7 +1614,7 @@ void ChatBubbleThink()
 		remove(self);
 		return;
 	}
-	if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && self.owner.predator.classname != "player" && self.owner.fakepredator.classname != "player")
+	if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && !self.owner.stat_eaten && self.owner.fakepredator.classname != "player")
 #ifdef TETRIS
 		|| self.owner.tetris_on
 #endif
@@ -1652,7 +1657,7 @@ void TeamBubbleThink()
 		return;
 	}
 //	setorigin(self, self.owner.origin + '0 0 15' + self.owner.maxs_z * '0 0 1');  // bandwidth hog. setattachment does this now
-	if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.predator.classname == "player" || self.owner.fakepredator.classname == "player")
+	if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.stat_eaten)
 		self.model = "";
 	else
 	{
@@ -1708,10 +1713,31 @@ void UpdateTeamBubble()
 	else self.colormod = '1 1 1';
 };*/
 
+.float oldcolormap;
 void respawn(void)
 {
+	if(self.alpha >= 0 && self.modelindex != 0 && cvar("g_respawn_ghosts"))
+	{
+		self.solid = SOLID_NOT;
+		self.takedamage = DAMAGE_NO;
+		self.movetype = MOVETYPE_FLY;
+		self.velocity = '0 0 1' * cvar("g_respawn_ghosts_speed");
+		self.avelocity = randomvec() * cvar("g_respawn_ghosts_speed") * 3 - randomvec() * cvar("g_respawn_ghosts_speed") * 3;
+		self.effects |= EF_ADDITIVE;
+		self.oldcolormap = self.colormap;
+		self.colormap = 512;
+		pointparticles(particleeffectnum("respawn_ghost"), self.origin, '0 0 0', 1);
+		if(cvar("g_respawn_ghosts_maxtime"))
+			SUB_SetFade (self, time + cvar("g_respawn_ghosts_maxtime") / 2 + random () * (cvar("g_respawn_ghosts_maxtime") - cvar("g_respawn_ghosts_maxtime") / 2), 1.5);
+	}
+
 	CopyBody(1);
 	self.effects |= EF_NODRAW; // prevent another CopyBody
+	if(self.oldcolormap)
+	{
+		self.colormap = self.oldcolormap;
+		self.oldcolormap = 0;
+	}
 	PutClientInServer();
 }
 
@@ -2048,6 +2074,7 @@ void SpectateCopy(entity spectatee) {
 	self.dmg_save = spectatee.dmg_save;
 	self.dmg_inflictor = spectatee.dmg_inflictor;
 	self.angles = spectatee.v_angle;
+	self.scale = spectatee.scale;
 	self.fixangle = TRUE;
 	self.stomach_load = spectatee.stomach_load;
 	self.stat_eaten = spectatee.stat_eaten;
@@ -2055,6 +2082,10 @@ void SpectateCopy(entity spectatee) {
 	self.stat_digesting = spectatee.stat_digesting;
 	self.stat_canleave = spectatee.stat_canleave;
 	self.stat_canswallow = spectatee.stat_canswallow;
+	self.stat_sbring1_type = spectatee.stat_sbring1_type;
+	self.stat_sbring1_clip = spectatee.stat_sbring1_clip;
+	self.stat_sbring2_type = spectatee.stat_sbring2_type;
+	self.stat_sbring2_clip = spectatee.stat_sbring2_clip;
 	setorigin(self, spectatee.origin);
 	setsize(self, spectatee.mins, spectatee.maxs);
 	SetZoomState(spectatee.zoomstate);
@@ -2248,32 +2279,28 @@ float vercmp(string v1, string v2)
 
 void ApplyHealthSize()
 {
+	// change player scale based on the amount of health we have
+
 	if not(cvar("g_healthsize"))
 		return;
 
-	if(self.predator.classname == "player" || self.fakeprey)
+	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)
 	{
-		self.view_ofs = PL_CROUCH_VIEW_OFS * self.predator.scale;
-		self.scale = 0;
+		//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
 	{
-		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);
-			self.view_ofs = PL_CROUCH_VIEW_OFS * self.scale;
-		}
-		else
-		{
-			//setsize (self, PL_MIN * self.scale, PL_MAX * self.scale);
+		//setsize (self, PL_MIN * self.scale, PL_MAX * self.scale);
+		if(!self.stat_eaten)
 			self.view_ofs = PL_VIEW_OFS * self.scale;
-		}
 	}
 }
 
@@ -2599,7 +2626,6 @@ void PlayerPreThink (void)
 			}
 		}
 
-		// health based player size
 		ApplyHealthSize();
 
 		FixPlayermodel();