X-Git-Url: https://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_client.qc;h=33a001828160eefb37b70680632ff89071d3bff0;hp=fe30cae7843ee007ff0bbadd1436d42466f3db62;hb=2618787aae8e7ed03c7c01ad48964296054d96ad;hpb=4f95b781634dfd647f12bdc7f08a3069cab384fc

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index fe30cae7..33a00182 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -406,6 +406,7 @@ string CheckPlayerModel(string plyermodel) {
 	{
 		if(substring(plyermodel,-4,4) != ".zym")
 		if(substring(plyermodel,-4,4) != ".dpm")
+		if(substring(plyermodel,-4,4) != ".iqm")
 		if(substring(plyermodel,-4,4) != ".md3")
 		if(substring(plyermodel,-4,4) != ".psk")
 			return FallbackPlayerModel;
@@ -417,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()
@@ -457,7 +459,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);
 }
 
@@ -469,7 +471,7 @@ void Client_uncustomizeentityforclient()
 float Client_customizeentityforclient()
 {
 	entity modelsource;
-	string applymodel;
+	string stomachmodel;
 
 	if(self.modelindex == 0)
 		return TRUE;
@@ -511,27 +513,27 @@ float Client_customizeentityforclient()
 	// now change the predator's player model into a stomach model for the prey
 	// in other words, when a player is swallowed by another player, the predator becomes an inward stomach model so the prey can see theirself in the stomach
 	// 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
 
-	// don't do this if we have chase_active enabled, as we'd be seeing a floating stomach from third person view
-	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" || self.fakeprey)
-			self.alpha = default_player_alpha;
-		return TRUE;
-	}
 	if(other.spectatee_status)
 		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)
 	{
-		applymodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length
-		Client_setmodel(applymodel);
+		Client_setmodel(stomachmodel);
 		self.alpha = other.cvar_cl_vore_stomachmodel;
 		return TRUE;
 	}
+
 	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(cvar("g_vore_neighborprey_distance") && self.predator == other.predator && self != other && !(other.cvar_chase_active || other.classname == "observer"))
+		self.alpha = default_player_alpha; // allow seeing neighboring prey
+	else
+		self.alpha = -1; // hide prey
 	return TRUE;
 }
 
@@ -725,7 +727,7 @@ void FixPlayermodel()
 		{
 			m1 = self.mins;
 			m2 = self.maxs;
-			setmodel_apply (defaultmodel);
+			setmodel_apply (defaultmodel, TRUE);
 			setsize (self, m1, m2);
 			chmdl = TRUE;
 		}
@@ -738,7 +740,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;
 		}
@@ -828,6 +830,9 @@ 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;
 		self.iscreature = TRUE;
@@ -922,8 +927,6 @@ void PutClientInServer (void)
 
 		SetCustomizer(self, Client_customizeentityforclient, Client_uncustomizeentityforclient);
 
-		Vore_DeadPrey_Detach(self);
-
 		self.model = "";
 		FixPlayermodel();
 
@@ -935,7 +938,7 @@ void PutClientInServer (void)
 		// don't reset back to last position, even if new position is stuck in solid
 		self.oldorigin = self.origin;
 		self.prevorigin = self.origin;
-		self.lastrocket = world; // stop rocket guiding, no revenge from the grave!
+		self.lastteleporttime = time; // prevent insane speeds due to changing origin
 
 		if(g_arena)
 		{
@@ -992,8 +995,16 @@ void PutClientInServer (void)
 
 		// reset fields the weapons may use
         for (j = WEP_FIRST; j <= WEP_LAST; ++j)
+		{
             weapon_action(j, WR_RESETPLAYER);
 
+			// all weapons must be fully loaded when we spawn
+			entity e;
+			e = get_weaponinfo(j);
+			if(e.spawnflags & WEP_FLAG_RELOADABLE) // prevent accessing undefined cvars
+				self.weapon_load[j] = cvar(strcat("g_balance_", e.netname, "_reload_ammo"));
+		}
+
 		oldself = self;
 		self = spot;
 			activator = oldself;
@@ -1603,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
@@ -1646,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
 	{
@@ -1702,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();
 }
 
@@ -1924,8 +1956,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.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");
+		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.wav");
+		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.wav");
 
 		// if player rotted to death...  die!
 		if(self.health < 1)
@@ -2021,6 +2053,8 @@ void SpectateCopy(entity spectatee) {
 	self.armortype = spectatee.armortype;
 	self.armorvalue = spectatee.armorvalue;
 	self.ammo_fuel = spectatee.ammo_fuel;
+	self.clip_load = spectatee.clip_load;
+	self.clip_size = spectatee.clip_size;
 	self.effects = spectatee.effects & EFMASK_CHEAP; // eat performance
 	self.health = spectatee.health;
 	self.impulse = 0;
@@ -2040,12 +2074,18 @@ 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;
 	self.stat_stomachload = spectatee.stat_stomachload;
 	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);
@@ -2237,6 +2277,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
+		self.scale *= cvar("g_vore_neighborprey_scale");
+	}
+}
+
 void ObserverThink()
 {
 	if (self.flags & FL_JUMPRELEASED) {
@@ -2559,6 +2632,8 @@ void PlayerPreThink (void)
 			}
 		}
 
+		SetPlayerSize();
+
 		FixPlayermodel();
 
 		GrabberFrame();
@@ -2634,11 +2709,31 @@ void PlayerPreThink (void)
 	if(self.taunt_soundtime)
 	if(time > self.taunt_soundtime)
 	{
+		switch(self.taunt_soundtype)
+		{
+			case TAUNTTYPE_DEATH:
+				PlayerSound(self, playersound_taunt, CHAN_VOICE, VOICETYPE_AUTOTAUNT);
+				break;
+			case TAUNTTYPE_VOREPRED:
+				PlayerSound(self, playersound_pred, CHAN_VOICE, VOICETYPE_AUTOTAUNT);
+				break;
+			case TAUNTTYPE_VOREPREY:
+				PlayerSound(self, playersound_prey, CHAN_VOICE, VOICETYPE_AUTOTAUNT);
+				break;
+			default:
+				dprint("Incorrect autotaunt type\n");
+				break;
+		}
+
 		self.taunt_soundtime = 0;
-		PlayerSound(self, playersound_taunt, CHAN_VOICE, VOICETYPE_AUTOTAUNT);
+		self.taunt_soundtype = 0;
 	}
 
 	target_voicescript_next(self);
+
+	// if a player goes unarmed after holding a loaded weapon, empty his clip size and remove the crosshair ammo ring
+	if(!self.weapon)
+		self.clip_load = self.clip_size = 0;
 }
 
 float isInvisibleString(string s)
@@ -2651,9 +2746,16 @@ float isInvisibleString(string s)
 		switch(c)
 		{
 			case 0:
-			case 32:
-			case 160:
+			case 32: // space
 				break;
+			case 192: // charmap space
+				if (!cvar("utf8_enable"))
+					break;
+				return FALSE;
+			case 160: // space in unicode fonts
+			case 0xE000 + 192: // utf8 charmap space
+				if (cvar("utf8_enable"))
+					break;
 			default:
 				return FALSE;
 		}