X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_client.qc;h=3ec0cddf5c4e0b37283600a961c4d1c7e1e79deb;hp=393463ccff1fd88f0a874e39b6504941eccbf43c;hb=189d1f9770ad26d090c52d8d5512f31315698469;hpb=1ff32fa85b80080b1b779e15311263c225f17a59

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 393463cc..3ec0cddf 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -516,13 +516,13 @@ float Client_customizeentityforclient()
 	if(other.cvar_chase_active > 0 || other.classname == "observer") // the classname check prevents a bug
 	{
 		Client_setmodel(setmodel_state());
-		if not(self.predator.classname == "player")
+		if not(self.predator.classname == "player" || self.fakepredator.classname == "player")
 			self.alpha = default_player_alpha;
 		return TRUE;
 	}
 	if(other.spectatee_status)
 		other = other.enemy; // also do this for the player we are spectating
-	if(other.predator == self)
+	if(other.predator == self || other.fakepredator == self)
 	{
 		applymodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length
 		Client_setmodel(applymodel);
@@ -530,7 +530,7 @@ float Client_customizeentityforclient()
 		return TRUE;
 	}
 	Client_setmodel(setmodel_state());
-	if not(self.predator.classname == "player")
+	if not(self.predator.classname == "player" || self.fakepredator.classname == "player")
 		self.alpha = default_player_alpha;
 	return TRUE;
 }
@@ -604,7 +604,8 @@ void PutObserverInServer (void)
 	self.armorvalue = cvar("g_balance_armor_start");
 	self.pauserotarmor_finished = 0;
 	self.pauserothealth_finished = 0;
-	self.pauseregen_finished = 0;
+	self.pauseregenhealth_finished = 0;
+	self.pauseregenarmor_finished = 0;
 	self.damageforcescale = 0;
 	self.death_time = 0;
 	self.dead_frame = 0;
@@ -827,15 +828,21 @@ void PutClientInServer (void)
 
 		RemoveGrabber(self); // Wazat's Grabber
 
+		Vore_DeadPrey_Detach(self);
+
 		self.classname = "player";
 		self.wasplayer = TRUE;
 		self.iscreature = TRUE;
 		self.movetype = MOVETYPE_WALK;
-		self.solid = SOLID_SLIDEBOX;
-		if(cvar("g_playerclip_collisions"))
-			self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY | DPCONTENTS_PLAYERCLIP;
+		if(cvar("g_player_colisions"))
+			self.solid = SOLID_SLIDEBOX;
 		else
-			self.dphitcontentsmask = DPCONTENTS_SOLID | DPCONTENTS_BODY;
+			self.solid = SOLID_CORPSE;
+		self.dphitcontentsmask = DPCONTENTS_BODY | DPCONTENTS_SOLID;
+		if(cvar("g_playerclip_collisions"))
+			self.dphitcontentsmask |= DPCONTENTS_PLAYERCLIP;
+		if(clienttype(self) == CLIENTTYPE_BOT && cvar("g_botclip_collisions"))
+			self.dphitcontentsmask |= DPCONTENTS_BOTCLIP;
 		self.frags = FRAGS_PLAYER;
 		if(independent_players)
 			MAKE_INDEPENDENT_PLAYER(self);
@@ -869,13 +876,15 @@ void PutClientInServer (void)
 		self.pauserotarmor_finished = time + cvar("g_balance_pause_armor_rot_spawn");
 		self.pauserothealth_finished = time + cvar("g_balance_pause_health_rot_spawn");
 		self.pauserotfuel_finished = time + cvar("g_balance_pause_fuel_rot_spawn");
-		self.pauseregen_finished = time + cvar("g_balance_pause_health_regen_spawn");
+		self.pauseregenhealth_finished = time + cvar("g_balance_pause_health_regen_spawn");
+		self.pauseregenarmor_finished = time + cvar("g_balance_pause_armor_regen_spawn");
 		//extend the pause of rotting if client was reset at the beginning of the countdown
 		if(!cvar("sv_ready_restart_after_countdown") && time < game_starttime) { // TODO why is this cvar NOTted?
 			self.spawnshieldtime += game_starttime - time;
 			self.pauserotarmor_finished += game_starttime - time;
 			self.pauserothealth_finished += game_starttime - time;
-			self.pauseregen_finished += game_starttime - time;
+			self.pauseregenhealth_finished += game_starttime - time;
+			self.pauseregenarmor_finished += game_starttime - time;
 		}
 		self.damageforcescale = 2;
 		self.death_time = 0;
@@ -1010,9 +1019,11 @@ float ClientInit_SendEntity(entity to, float sf)
 		WriteString(MSG_ENTITY, world.fog);
 	else
 		WriteString(MSG_ENTITY, "");
+	WriteCoord(MSG_ENTITY, cvar("g_campaign"));
 	WriteByte(MSG_ENTITY, cvar("g_balance_armor_blockpercent") * 255.0);
 	WriteByte(MSG_ENTITY, cvar("g_balance_weaponswitchdelay") * 255.0);
 
+	WriteCoord(MSG_ENTITY, cvar("g_vore"));
 	WriteCoord(MSG_ENTITY, cvar("g_balance_vore_swallow_limit"));
 	return TRUE;
 }
@@ -1845,7 +1856,8 @@ float CalcRot(float current, float stable, float rotfactor, float rotframetime)
 		return max(stable, current + (stable - current) * rotfactor * rotframetime);
 }
 
-float CalcRotRegen(float current, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime, float limit)
+.float regen_soundtime;
+float CalcRotRegen(float current, float regenstable, float regenfactor, float regenlinear, float regenframetime, float rotstable, float rotfactor, float rotlinear, float rotframetime, float limit, string regensound)
 {
 	if(current > rotstable)
 	{
@@ -1861,6 +1873,18 @@ float CalcRotRegen(float current, float regenstable, float regenfactor, float re
 		{
 			current = CalcRegen(current, regenstable, regenfactor, regenframetime);
 			current = min(regenstable, current + regenlinear * regenframetime);
+
+			if(regensound != "")
+			if(regenfactor || regenlinear)
+			{
+				if(self.regen_soundtime < time)
+				{
+					msg_entity = self;
+					if(clienttype(msg_entity) == CLIENTTYPE_REAL)
+						soundto(MSG_ONE, self, CHAN_AUTO, regensound, VOL_BASE, ATTN_NONE);
+				}
+				self.regen_soundtime = time + 1; // only replay the sound if regen was paused for one second
+			}
 		}
 	}
 
@@ -1900,8 +1924,8 @@ void player_regen (void)
 
 	if (!g_ca && (!g_lms || cvar("g_lms_regenerate")))
 	{
-		self.armorvalue = CalcRotRegen(self.armorvalue, mina, cvar("g_balance_armor_regen"), cvar("g_balance_armor_regenlinear"), regen_mod * frametime * (time > self.pauseregen_finished), maxa, cvar("g_balance_armor_rot"), cvar("g_balance_armor_rotlinear"), rot_mod * frametime * (time > self.pauserotarmor_finished), limita);
-		self.health = CalcRotRegen(self.health, minh, cvar("g_balance_health_regen"), cvar("g_balance_health_regenlinear"), regen_mod * frametime * (time > self.pauseregen_finished), maxh, cvar("g_balance_health_rot"), cvar("g_balance_health_rotlinear"), rot_mod * frametime * (time > self.pauserothealth_finished), limith);
+		self.armorvalue = CalcRotRegen(self.armorvalue, mina, cvar("g_balance_armor_regen"), cvar("g_balance_armor_regenlinear"), regen_mod * frametime * (time > self.pauseregenarmor_finished), maxa, cvar("g_balance_armor_rot"), cvar("g_balance_armor_rotlinear"), rot_mod * frametime * (time > self.pauserotarmor_finished), limita, "misc/armor_regen.ogg");
+		self.health = CalcRotRegen(self.health, minh, cvar("g_balance_health_regen"), cvar("g_balance_health_regenlinear"), regen_mod * frametime * (time > self.pauseregenhealth_finished), maxh, cvar("g_balance_health_rot"), cvar("g_balance_health_rotlinear"), rot_mod * frametime * (time > self.pauserothealth_finished), limith, "misc/health_regen.ogg");
 
 		// if player rotted to death...  die!
 		if(self.health < 1)
@@ -1909,7 +1933,7 @@ void player_regen (void)
 	}
 
 	if not(self.items & IT_UNLIMITED_WEAPON_AMMO)
-		self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, cvar("g_balance_fuel_regen"), cvar("g_balance_fuel_regenlinear"), regen_mod * frametime * (time > self.pauseregen_finished) * (self.items & IT_FUEL_REGEN != 0), maxf, cvar("g_balance_fuel_rot"), cvar("g_balance_fuel_rotlinear"), rot_mod * frametime * (time > self.pauserotfuel_finished), limitf);
+		self.ammo_fuel = CalcRotRegen(self.ammo_fuel, minf, cvar("g_balance_fuel_regen"), cvar("g_balance_fuel_regenlinear"), regen_mod * frametime * (time > self.pauseregenhealth_finished) * (self.items & IT_FUEL_REGEN != 0), maxf, cvar("g_balance_fuel_rot"), cvar("g_balance_fuel_rotlinear"), rot_mod * frametime * (time > self.pauserotfuel_finished), limitf, "");
 }
 
 float zoomstate_set;
@@ -2001,6 +2025,7 @@ void SpectateCopy(entity spectatee) {
 	self.health = spectatee.health;
 	self.impulse = 0;
 	self.items = spectatee.items;
+	self.last_pickup = spectatee.last_pickup;
 	self.strength_finished = spectatee.strength_finished;
 	self.invincible_finished = spectatee.invincible_finished;
 	self.pressedkeys = spectatee.pressedkeys;