X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_client.qc;h=8f058155c16a32c95245724dd31d9a967fafb382;hp=49d1ea05fe7d0edce4b981d0a733414dd80e8fa1;hb=02d2b7c6fea422d536b734893e079ab7f123c1c9;hpb=0194636efd5ba1d282165dfd29f3314da5d1cc6d

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 49d1ea05..8f058155 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -418,11 +418,12 @@ string CheckPlayerModel(string plyermodel) {
 	return plyermodel;
 }
 
-void setmodel_apply(string modelname)
+void setmodel_apply(string modelname, float reset_anims)
 {
 	precache_model(modelname);
 	setmodel(self, modelname); // players have high precision
-	player_setupanimsformodel();
+	if(reset_anims)
+		player_setupanimsformodel();
 }
 
 string setmodel_state()
@@ -434,8 +435,16 @@ string setmodel_state()
 	newmodel_name = substring(self.playermodel, 0, strlen(self.playermodel) - 4);
 	newmodel_extension = substring(self.playermodel, strlen(self.playermodel) - 4, 4);
 
-	if(self.stomach_load)
-		applymodel = strcat(newmodel_name, "_state", ftos(floor(self.stomach_load)), newmodel_extension);
+	float vore_state;
+	if(self.stomach_load > ceil(g_balance_vore_swallow_limit * 0.6))
+		vore_state = 3;
+	else if(self.stomach_load > ceil(g_balance_vore_swallow_limit * 0.3))
+		vore_state = 2;
+	else if(self.stomach_load)
+		vore_state = 1;
+
+	if(vore_state)
+		applymodel = strcat(newmodel_name, "_state", ftos(vore_state), newmodel_extension);
 	else
 		applymodel = self.playermodel;
 
@@ -458,7 +467,7 @@ void Client_setmodel(string applymodel)
 	applymodel = CheckPlayerModel(applymodel); // this is never "", so no endless loop
 	m1 = self.mins;
 	m2 = self.maxs;
-	setmodel_apply(applymodel);
+	setmodel_apply(applymodel, FALSE);
 	setsize (self, m1, m2);
 }
 
@@ -514,28 +523,25 @@ float Client_customizeentityforclient()
 	// this is only visible to the prey however, otherwise players would appear as a floating stomach to everyone (ewww)
 	stomachmodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length
 
-	if(other.spectatee_status)
+	if(other.spectatee_status && other.spectatee_status == num_for_edict(other.enemy))
 		other = other.enemy; // also do this for the player we are spectating
 
 	// don't do this if we have chase_active enabled, as we'd be seeing a floating stomach from third person view
 	if not(other.cvar_chase_active || other.classname == "observer") // the observer check prevents a bug
 	if(other.predator == self || other.fakepredator == self)
 	{
-		if(self.model != stomachmodel) // don't execute each frame
-		{
-			Client_setmodel(stomachmodel);
-			self.frame = 0; // don't use any animations as a stomach
-			self.alpha = other.cvar_cl_vore_stomachmodel;
-		}
+		Client_setmodel(stomachmodel);
+		self.alpha = other.cvar_cl_vore_stomachmodel;
 		return TRUE;
 	}
 
-	if(self.model != setmodel_state())  // don't execute each frame
-	{
-		Client_setmodel(setmodel_state());
-		if not(self.predator.classname == "player" || self.fakeprey)
-			self.alpha = default_player_alpha;
-	}
+	Client_setmodel(setmodel_state());
+	if not(self.stat_eaten || self.fakeprey)
+		self.alpha = default_player_alpha;
+	else if(cvar("g_vore_neighborprey_distance") && !self.fakeprey && (self.predator == other.predator || self.predator == other.fakepredator) && !(other.cvar_chase_active || other.classname == "observer"))
+		self.alpha = default_player_alpha; // allow seeing neighboring prey
+	else
+		self.alpha = -1; // hide prey
 	return TRUE;
 }
 
@@ -729,7 +735,7 @@ void FixPlayermodel()
 		{
 			m1 = self.mins;
 			m2 = self.maxs;
-			setmodel_apply (defaultmodel);
+			setmodel_apply (defaultmodel, TRUE);
 			setsize (self, m1, m2);
 			chmdl = TRUE;
 		}
@@ -742,7 +748,7 @@ void FixPlayermodel()
 			self.playermodel = CheckPlayerModel(self.playermodel); // this is never "", so no endless loop
 			m1 = self.mins;
 			m2 = self.maxs;
-			setmodel_apply (self.playermodel);
+			setmodel_apply (self.playermodel, TRUE);
 			setsize (self, m1, m2);
 			chmdl = TRUE;
 		}
@@ -833,6 +839,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;
@@ -1036,7 +1043,14 @@ float ClientInit_SendEntity(entity to, float sf)
 	WriteByte(MSG_ENTITY, cvar("g_balance_weaponswitchdelay") * 255.0);
 
 	WriteCoord(MSG_ENTITY, cvar("g_vore"));
-	WriteCoord(MSG_ENTITY, cvar("g_balance_vore_swallow_limit"));
+	WriteCoord(MSG_ENTITY, g_balance_vore_swallow_limit);
+
+	// tell the client if this server uses armor
+	float armor_enabled;
+	if(cvar("g_balance_armor_start") || (cvar("g_lms") && cvar("g_lms_start_armor")) || (inWarmupStage && cvar("g_warmup_start_armor")) || cvar("g_balance_armor_regen") || cvar("g_balance_armor_regenlinear"))
+		armor_enabled = TRUE;
+	WriteByte(MSG_ENTITY, armor_enabled);
+
 	return TRUE;
 }
 
@@ -1615,7 +1629,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
@@ -1658,7 +1672,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
 	{
@@ -1714,10 +1728,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();
 }
 
@@ -2054,6 +2089,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;
@@ -2061,6 +2097,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);
@@ -2252,6 +2292,39 @@ float vercmp(string v1, string v2)
 	return vercmp_recursive(v1, v2);
 }
 
+void SetPlayerSize()
+{
+	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");
+
+		// 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;
+		}
+	}
+
+	if(self.stat_eaten && cvar("g_vore_neighborprey_distance"))
+	{
+		// resize prey if neighborprey is enabled
+		self.scale *= cvar("g_vore_neighborprey_scale");
+	}
+}
+
 void ObserverThink()
 {
 	if (self.flags & FL_JUMPRELEASED) {
@@ -2440,6 +2513,29 @@ void PlayerPreThink (void)
 
 		if(frametime)
 		{
+
+			if(self.health <= 0 && cvar("g_deathglow"))
+			{
+				if(self.glowmod_x > 0)
+					self.glowmod_x -= cvar("g_deathglow") * frametime;
+				else
+					self.glowmod_x = -1;
+				if(self.glowmod_y > 0)
+					self.glowmod_y -= cvar("g_deathglow") * frametime;
+				else
+					self.glowmod_y = -1;
+				if(self.glowmod_z > 0)
+					self.glowmod_z -= cvar("g_deathglow") * frametime;
+				else
+					self.glowmod_z = -1;
+			}
+			else
+			{
+				// set weapon and player glowmod
+				self.glowmod = colormapPaletteColor(self.clientcolors & 0x0F, TRUE) * 2;
+				self.weaponentity_glowmod = self.glowmod;
+			}
+
 			player_powerups();
 		}
 
@@ -2574,6 +2670,8 @@ void PlayerPreThink (void)
 			}
 		}
 
+		SetPlayerSize();
+
 		FixPlayermodel();
 
 		GrabberFrame();