X-Git-Url: http://de.git.xonotic.org/?p=voretournament%2Fvoretournament.git;a=blobdiff_plain;f=data%2Fqcsrc%2Fserver%2Fcl_client.qc;h=3062930029604e786ba4ae094ad7f8a211c3b141;hp=e707f9997b44effe93a24ccbd21e053532f801c4;hb=e79a9bac1c149bc0f0488f33508007586a8cb9af;hpb=de6f8785aa0c4a5ced4d54314c15a046c04fad22

diff --git a/data/qcsrc/server/cl_client.qc b/data/qcsrc/server/cl_client.qc
index e707f999..30629300 100644
--- a/data/qcsrc/server/cl_client.qc
+++ b/data/qcsrc/server/cl_client.qc
@@ -435,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.666666666666))
+		vore_state = 3;
+	else if(self.stomach_load > ceil(g_balance_vore_swallow_limit * 0.333333333333))
+		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;
 
@@ -530,7 +538,7 @@ float Client_customizeentityforclient()
 	Client_setmodel(setmodel_state());
 	if not(self.stat_eaten || self.fakeprey)
 		self.alpha = default_player_alpha;
-	else if(cvar("g_vore_neighborprey_distance") && (self.predator == other.predator || self.predator == other.fakepredator) && !(other.cvar_chase_active || other.classname == "observer"))
+	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
@@ -1035,7 +1043,7 @@ 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);
 	return TRUE;
 }
 
@@ -2498,6 +2506,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();
 		}