X-Git-Url: http://de.git.xonotic.org/?a=blobdiff_plain;f=qcsrc%2Fcommon%2Feffects%2Fqc%2Fgibs.qc;h=35f0fe52256b8cbca67f35bd846ea1caaf2d9957;hb=991de5e6922cd3c283de56c3249624f0f1bfe767;hp=45a28a9b485dbd6299febc78825cee0c529f2428;hpb=db2efd7cabe9d2eb3e09f330d9e5c8f951fbf194;p=xonotic%2Fxonotic-data.pk3dir.git

diff --git a/qcsrc/common/effects/qc/gibs.qc b/qcsrc/common/effects/qc/gibs.qc
index 45a28a9b4..35f0fe522 100644
--- a/qcsrc/common/effects/qc/gibs.qc
+++ b/qcsrc/common/effects/qc/gibs.qc
@@ -1,6 +1,5 @@
 #include "gibs.qh"
 
-#ifdef IMPLEMENTATION
 REGISTER_NET_TEMP(net_gibsplash)
 
 #ifdef SVQC
@@ -17,7 +16,7 @@ bool Violence_GibSplash_SendEntity(entity this, entity to, int sf)
 	WriteShort(channel, floor(this.origin.x / 4)); // not using a coord here, as gibs don't need this accuracy
 	WriteShort(channel, floor(this.origin.y / 4)); // not using a coord here, as gibs don't need this accuracy
 	WriteShort(channel, floor(this.origin.z / 4)); // not using a coord here, as gibs don't need this accuracy
-	WriteShort(channel, this.oldorigin.x); // acrually compressed velocity
+	WriteShort(channel, this.oldorigin.x); // actually compressed velocity
 	return true;
 }
 
@@ -46,7 +45,7 @@ void Violence_GibSplash_At(vector org, vector dir, float type, float amount, ent
 	e.oldorigin_x = compressShortVector(e.velocity);
 
 	FOREACH_CLIENT(IS_REAL_CLIENT(it), Violence_GibSplash_SendEntity(e, it, 0));
-	remove(e);
+	delete(e);
 }
 
 void Violence_GibSplash(entity source, float type, float amount, entity attacker)
@@ -70,7 +69,7 @@ void Violence_GibSplash(entity source, float type, float amount, entity attacker
 
 void Gib_Delete(entity this)
 {
-	remove(this);
+	delete(this);
 }
 
 string species_prefix(int specnum);
@@ -111,27 +110,27 @@ void new_te_bloodshower (int ef, vector org, float explosionspeed, int howmany)
 		__pointparticles(ef, org, randomvec() * explosionspeed, howmany / 50);
 }
 
-void SUB_RemoveOnNoImpact()
+void SUB_RemoveOnNoImpact(entity this, entity toucher)
 {
 	if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
-		Gib_Delete(self);
+		Gib_Delete(this);
 }
 
-void Gib_Touch()
-{SELFPARAM();
+void Gib_Touch(entity this, entity toucher)
+{
 	// TODO maybe bounce of walls, make more gibs, etc.
 
 	if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
 	{
-		Gib_Delete(self);
+		Gib_Delete(this);
 		return;
 	}
 
-	if(!self.silent)
-		sound(self, CH_PAIN, SND_GIB_SPLAT_RANDOM(), VOL_BASE, ATTEN_NORM);
-	__pointparticles(_particleeffectnum(strcat(species_prefix(self.cnt), "blood")), self.origin + '0 0 1', '0 0 30', 10);
+	if(!this.silent)
+		sound(this, CH_PAIN, SND_GIB_SPLAT_RANDOM(), VOL_BASE, ATTEN_NORM);
+	__pointparticles(_particleeffectnum(strcat(species_prefix(this.cnt), "blood")), this.origin + '0 0 1', '0 0 30', 10);
 
-	Gib_Delete(self);
+	Gib_Delete(this);
 }
 
 void Gib_Draw(entity this)
@@ -143,7 +142,7 @@ void Gib_Draw(entity this)
 	if(wasfreed(this))
 		return;
 
-	if(this.touch == Gib_Touch) // don't do this for the "chunk" thingie...
+	if(gettouch(this) == Gib_Touch) // don't do this for the "chunk" thingie...
 		// TODO somehow make it spray in a direction dependent on this.angles
 		__trailparticles(this, _particleeffectnum(strcat(species_prefix(this.cnt), EFFECT_TR_SLIGHTBLOOD.eent_eff_name)), oldorg, this.origin);
 	else
@@ -170,7 +169,7 @@ void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector
 
 	// TODO remove some gibs according to cl_nogibs
 	gib = RubbleNew("gib");
-	gib.move_movetype = MOVETYPE_BOUNCE;
+	set_movetype(gib, MOVETYPE_BOUNCE);
 	gib.gravity = 1;
 	gib.solid = SOLID_CORPSE;
 	gib.cnt = specnum;
@@ -180,10 +179,11 @@ void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector
 	setsize (gib, '-8 -8 -8', '8 8 8');
 
 	gib.draw = Gib_Draw;
+	IL_PUSH(g_drawables, gib);
 	if(destroyontouch)
-		gib.move_touch = Gib_Touch;
+		settouch(gib, Gib_Touch);
 	else
-		gib.move_touch = SUB_RemoveOnNoImpact;
+		settouch(gib, SUB_RemoveOnNoImpact);
 
 	// don't spawn gibs inside solid - just don't
 	if(org != safeorg)
@@ -192,10 +192,9 @@ void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector
 		org = trace_endpos;
 	}
 
-	gib.move_origin = org;
 	setorigin(gib, org);
-	gib.move_velocity = vconst * autocvar_cl_gibs_velocity_scale + vrand * autocvar_cl_gibs_velocity_random + '0 0 1' * autocvar_cl_gibs_velocity_up;
-	gib.move_avelocity = prandomvec() * vlen(gib.move_velocity) * autocvar_cl_gibs_avelocity_scale;
+	gib.velocity = vconst * autocvar_cl_gibs_velocity_scale + vrand * autocvar_cl_gibs_velocity_random + '0 0 1' * autocvar_cl_gibs_velocity_up;
+	gib.avelocity = prandomvec() * vlen(gib.velocity) * autocvar_cl_gibs_avelocity_scale;
 	gib.move_time = time;
 	gib.damageforcescale = autocvar_cl_gibs_damageforcescale;
 
@@ -311,8 +310,6 @@ NET_HANDLE(net_gibsplash, bool isNew)
 			// no gibs in gentle mode, sorry
 			break;
 	}
-	remove(this);
+	delete(this);
 }
 #endif
-
-#endif