X-Git-Url: http://de.git.xonotic.org/?p=xonotic%2Fxonotic-data.pk3dir.git;a=blobdiff_plain;f=qcsrc%2Fclient%2Fgibs.qc;h=78826f8f34925e63b7e38954d0ea623f2773ee8b;hp=a92567e61928f90ff8f4c74916430234f4768f3d;hb=a090db7b58f8721e8344516bd896db69050a48d0;hpb=477b7b3e324bdb74aee19bfee925d708c7cf9758

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index a92567e619..78826f8f34 100644
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -97,9 +97,10 @@ void Gib_Draw()
 	self.alpha = bound(0, self.nextthink - time, 1);
 
 	if(self.alpha < ALPHA_MIN_VISIBLE)
+	{
+		self.drawmask = 0;
 		Gib_Delete();
-	else
-		R_AddEntity(self);
+	}
 }
 
 void TossGib (string mdlname, vector org, vector vconst, vector vrand, float specnum, float destroyontouch, float issilent)
@@ -130,6 +131,7 @@ void TossGib (string mdlname, vector org, vector vconst, vector vrand, float spe
 	gib.damageforcescale = cvar_or("cl_gibs_damageforcescale", 3.5);
 
 	gib.nextthink = time + cvar_or("cl_gibs_lifetime", 14) * (1 + prandom() * 0.15);
+	gib.drawmask = MASK_NORMAL;
 
 	RubbleLimit("gib", cvar_or("cl_gibs_maxcount",100), Gib_Delete);
 }
@@ -151,16 +153,16 @@ void Ent_GibSplash(float isNew)
 	org_z = ReadShort() * 4 + 2;
 	vel = decompressShortVector(ReadShort());
 
-	if(cvar("cl_gentle"))
+	if(cvar("cl_gentle_gibs") || cvar("cl_gentle"))
 		type |= 0x80; // set gentle bit
 
 	if(type & 0x80)
 	{
-		if(cvar("cl_gentle") == 2)
+		if(cvar("cl_gentle_gibs") == 2)
 			gentle_prefix = "";
-		else if(cvar("cl_gentle") == 3) 
+		else if(cvar("cl_gentle_gibs") == 3) 
 			gentle_prefix = "happy_";
-		else if(cvar("cl_gentle"))
+		else
 			gentle_prefix = "morphed_";
 	}
 	else if(cvar("cl_particlegibs"))
@@ -169,7 +171,7 @@ void Ent_GibSplash(float isNew)
 		gentle_prefix = "particlegibs_";
 	}
 
-	if not(cvar("cl_gentle"))
+	if not(cvar("cl_gentle_gibs") || cvar("cl_gentle"))
 		amount *= 1 - cvar("cl_nogibs");
 
 	if(cvar("ekg"))