X-Git-Url: https://de.git.xonotic.org/?a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_client.qc;h=d6898c8d7859e33099f9a1f077b18054fecdaab2;hb=64cbbc9cd75db2d7d8251e26d84e197cad389543;hp=60f4d472ec0915e2f50443e9300c2cc15fc53139;hpb=883173552c84fea40df97d3516f70ed150cb4b82;p=voretournament%2Fvoretournament.git

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index 60f4d472..d6898c8d 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -13,10 +13,13 @@ void Announce(string snd) {
 }
 
 void AnnounceTo(entity e, string snd) {
-	msg_entity = e;
-	WriteByte(MSG_ONE, SVC_TEMPENTITY);
-	WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE);
-	WriteString(MSG_ONE, snd);
+	if (clienttype(e) == CLIENTTYPE_REAL)
+	{
+		msg_entity = e;
+		WriteByte(MSG_ONE, SVC_TEMPENTITY);
+		WriteByte(MSG_ONE, TE_CSQC_ANNOUNCE);
+		WriteString(MSG_ONE, snd);
+	}
 }
 
 float ClientData_Send(entity to, float sf)
@@ -393,8 +396,7 @@ Checks if the argument string can be a valid playermodel.
 Returns a valid one in doubt.
 =============
 */
-// string FallbackPlayerModel = "models/player/vixen.zym";
-string FallbackPlayerModel = "models/onslaught/generator.md3"; // TEMPORARY !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+string FallbackPlayerModel = "models/player/vixen.zym";
 string CheckPlayerModel(string plyermodel) {
 	if(strlen(plyermodel) < 4)
 		return FallbackPlayerModel;
@@ -427,16 +429,12 @@ string setmodel_state()
 	// set the proper belly model depending on how full we are
 	string newmodel_name, newmodel_extension, applymodel;
 
-	tokenizebyseparator(self.playermodel, ".");
-	newmodel_name = argv(0);
-	newmodel_extension = argv(1);
+	// 4 is the extension length
+	newmodel_name = substring(self.playermodel, 0, strlen(self.playermodel) - 4);
+	newmodel_extension = substring(self.playermodel, strlen(self.playermodel) - 4, 4);
 
-	if(self.stomach_load >= 3)
-		applymodel = strcat(newmodel_name, "_state3.", newmodel_extension);
-	else if(self.stomach_load >= 2)
-		applymodel = strcat(newmodel_name, "_state2.", newmodel_extension);
-	else if(self.stomach_load >= 1)
-		applymodel = strcat(newmodel_name, "_state1.", newmodel_extension);
+	if(self.stomach_load)
+		applymodel = strcat(newmodel_name, "_state", ftos(floor(self.stomach_load)), newmodel_extension);
 	else
 		applymodel = self.playermodel;
 
@@ -471,6 +469,7 @@ void Client_uncustomizeentityforclient()
 float Client_customizeentityforclient()
 {
 	entity modelsource;
+	string applymodel;
 
 	if(self.modelindex == 0)
 		return TRUE;
@@ -510,24 +509,29 @@ float Client_customizeentityforclient()
 #endif
 
 	// 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 eater becomes an inward stomach model so the prey can see theirself in the stomach
+	// 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)
 
 	// 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.alpha = default_player_alpha;
 		return TRUE;
 	}
 	if(other.spectatee_status)
 		other = other.enemy; // also do this for the player we are spectating
-	if(other.eater == self)
+	if(other.predator == self)
 	{
-		tokenizebyseparator(self.playermodel, ".");
-		Client_setmodel(strcat(argv(0), "_stomach.md3"));
+		applymodel = strcat(substring(self.playermodel, 0, strlen(self.playermodel) - 4), "_stomach.md3"); // 4 is the extension length
+		Client_setmodel(applymodel);
+		self.alpha = other.cvar_cl_vore_stomachmodel;
 		return TRUE;
 	}
 	Client_setmodel(setmodel_state());
+	if not(self.predator.classname == "player")
+		self.alpha = default_player_alpha;
 	return TRUE;
 }
 
@@ -557,6 +561,8 @@ void PutObserverInServer (void)
 		WriteEntity(MSG_ONE, self);
 	}
 
+	Vore_Disconnect();
+
 	kh_Key_DropAll(self, TRUE);
 
 	if(self.flagcarried)
@@ -858,7 +864,6 @@ void PutClientInServer (void)
 		self.switchweapon = w_getbestweapon(self);
 		self.cnt = self.switchweapon;
 		self.weapon = 0;
-		self.jump_interval = time;
 
 		self.spawnshieldtime = time + cvar("g_spawnshieldtime");
 		self.pauserotarmor_finished = time + cvar("g_balance_pause_armor_rot_spawn");
@@ -1005,11 +1010,12 @@ 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"));
-	WriteCoord(MSG_ENTITY, cvar("g_vore_showpreyhealth"));
 	return TRUE;
 }
 
@@ -1588,7 +1594,7 @@ void ChatBubbleThink()
 		remove(self);
 		return;
 	}
-	if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && self.owner.eater.classname != "player")
+	if ((self.owner.BUTTON_CHAT && !self.owner.deadflag && self.owner.predator.classname != "player")
 #ifdef TETRIS
 		|| self.owner.tetris_on
 #endif
@@ -1620,7 +1626,6 @@ void UpdateChatBubble()
 	}
 }
 
-
 void TeamBubbleThink()
 {
 	self.nextthink = time;
@@ -1632,11 +1637,16 @@ 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.eater.classname == "player")
+	if (self.owner.BUTTON_CHAT || self.owner.deadflag || self.owner.killindicator || self.owner.predator.classname == "player")
 		self.model = "";
 	else
-		self.model = self.mdl;
-
+	{
+		if(cvar("g_balance_vore_teamheal") && cvar("g_vore_teamvore"))
+		if(self.owner.health < cvar("g_balance_vore_teamheal_stable"))
+			setmodel(self, "models/misc/teambubbleheal.spr"); // indicate that this player can be teamhealed
+		else
+			setmodel(self, "models/misc/teambubble.spr");
+	}
 };
 
 float TeamBubble_customizeentityforclient()
@@ -1660,8 +1670,8 @@ void UpdateTeamBubble()
 //		setorigin(self.teambubbleentity, self.origin + '0 0 15' + self.maxs_z * '0 0 1');
 		setorigin(self.teambubbleentity, '0 0 15' + self.maxs_z * '0 0 1');
 		setattachment(self.teambubbleentity, self, "");  // sticks to moving player better, also conserves bandwidth
-		self.teambubbleentity.mdl = self.teambubbleentity.model;
-		self.teambubbleentity.model = self.teambubbleentity.mdl;
+//		self.teambubbleentity.mdl = self.teambubbleentity.model;
+//		self.teambubbleentity.model = self.teambubbleentity.mdl;
 		self.teambubbleentity.customizeentityforclient = TeamBubble_customizeentityforclient;
 		self.teambubbleentity.effects = EF_LOWPRECISION;
 	}
@@ -2012,6 +2022,7 @@ void SpectateCopy(entity spectatee) {
 	self.stat_eaten = spectatee.stat_eaten;
 	self.stat_stomachload = spectatee.stat_stomachload;
 	self.stat_digesting = spectatee.stat_digesting;
+	self.stat_canleave = spectatee.stat_canleave;
 	setorigin(self, spectatee.origin);
 	setsize(self, spectatee.mins, spectatee.maxs);
 	SetZoomState(spectatee.zoomstate);
@@ -2315,9 +2326,6 @@ void PlayerPreThink (void)
 	// core code for the vore system
 	Vore();
 
-	if(self.spectatee_status)
-		Vore_Disconnect();
-
 	// version nagging
 	if(self.version_nagtime)
 		if(self.cvar_g_voretournamentversion)
@@ -2413,7 +2421,7 @@ void PlayerPreThink (void)
 			{
 				if(frametime)
 					player_anim();
-				button_pressed = (self.BUTTON_ATCK || self.BUTTON_JUMP || self.BUTTON_ATCK2 || self.BUTTON_GRABBER || self.BUTTON_USE);
+				button_pressed = (self.BUTTON_ATCK || self.BUTTON_JUMP || self.BUTTON_ATCK2 || self.BUTTON_JETPACK || self.BUTTON_USE);
 				force_respawn = (g_lms || (g_ca) || cvar("g_forced_respawn"));
 				if (self.deadflag == DEAD_DYING)
 				{