Remove .move_* fields and MOVETYPE_PUSH logic (doesn't work)

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / effects / qc / gibs.qc

diff --git a/qcsrc/common/effects/qc/gibs.qc b/qcsrc/common/effects/qc/gibs.qc
index 19f47500e5d19f1b9efef96e5b109679cdcd181f..aaecf18f91a5bd0ffade1db74bff71c23d4fcbbb 100644 (file)
--- a/qcsrc/common/effects/qc/gibs.qc
+++ b/qcsrc/common/effects/qc/gibs.qc
@@ -1,3 +1,5 @@
+#include "gibs.qh"
+
 #ifdef IMPLEMENTATION
 REGISTER_NET_TEMP(net_gibsplash)
 
@@ -20,7 +22,7 @@ bool Violence_GibSplash_SendEntity(entity this, entity to, int sf)
 }
 
 void Violence_GibSplash_At(vector org, vector dir, float type, float amount, entity gibowner, entity attacker)
-{SELFPARAM();
+{
        if(g_cts) // no gibs in CTS
                return;
 
@@ -29,21 +31,21 @@ void Violence_GibSplash_At(vector org, vector dir, float type, float amount, ent
        e.state = type; // should stay smaller than 15
        if(!sound_allowed(MSG_BROADCAST, gibowner) || !sound_allowed(MSG_BROADCAST, attacker))
                e.state |= 0x40; // "silence" bit
-       e.state |= 8 * self.species; // gib type, ranges from 0 to 15
+       e.state |= 8 * gibowner.species; // gib type, ranges from 0 to 15
 
        // if this is a copied dead body, send the num of its player instead
        // TODO: remove this field, read from model txt files
-       if(self.classname == "body")
-               e.team = etof(self.enemy);
+       if(gibowner.classname == "body")
+               e.team = etof(gibowner.enemy);
        else
-               e.team = etof(self);
+               e.team = etof(gibowner);
 
        setorigin(e, org);
        e.velocity = dir;
 
        e.oldorigin_x = compressShortVector(e.velocity);
 
-       entity cl; FOR_EACH_REALCLIENT(cl) Violence_GibSplash_SendEntity(e, cl, 0);
+       FOREACH_CLIENT(IS_REAL_CLIENT(it), Violence_GibSplash_SendEntity(e, it, 0));
        remove(e);
 }
 
@@ -59,16 +61,16 @@ void Violence_GibSplash(entity source, float type, float amount, entity attacker
 .bool silent;
 
 #include "rubble.qh"
-#include "../common/movetypes/movetypes.qh"
+#include <common/physics/movetypes/movetypes.qh>
 
 .float scale;
 .float alpha;
 .float cnt;
 .float gravity;
 
-void Gib_Delete()
-{SELFPARAM();
-       remove(self);
+void Gib_Delete(entity this)
+{
+       remove(this);
 }
 
 string species_prefix(int specnum);
@@ -109,56 +111,56 @@ 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();
+               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();
+               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();
+       Gib_Delete(this);
 }
 
 void Gib_Draw(entity this)
 {
        vector oldorg;
-       oldorg = self.origin;
+       oldorg = this.origin;
 
-       Movetype_Physics_MatchTicrate(self, autocvar_cl_gibs_ticrate, autocvar_cl_gibs_sloppy);
-       if(wasfreed(self))
+       Movetype_Physics_MatchTicrate(this, autocvar_cl_gibs_ticrate, autocvar_cl_gibs_sloppy);
+       if(wasfreed(this))
                return;
 
-       if(self.touch == Gib_Touch) // don't do this for the "chunk" thingie...
-               // TODO somehow make it spray in a direction dependent on self.angles
-               __trailparticles(self, _particleeffectnum(strcat(species_prefix(self.cnt), EFFECT_TR_SLIGHTBLOOD.eent_eff_name)), oldorg, self.origin);
+       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
-               __trailparticles(self, _particleeffectnum(strcat(species_prefix(self.cnt), EFFECT_TR_BLOOD.eent_eff_name)), oldorg, self.origin);
+               __trailparticles(this, _particleeffectnum(strcat(species_prefix(this.cnt), EFFECT_TR_BLOOD.eent_eff_name)), oldorg, this.origin);
 
-       self.renderflags = 0;
+       this.renderflags = 0;
 
        // make gibs die faster at low view quality
        // if view_quality is 0.5, we want to have them die twice as fast
-       self.nextthink -= frametime * (1 / bound(0.01, view_quality, 1.00) - 1);
+       this.nextthink -= frametime * (1 / bound(0.01, view_quality, 1.00) - 1);
 
-       self.alpha = bound(0, self.nextthink - time, 1);
+       this.alpha = bound(0, this.nextthink - time, 1);
 
-       if(self.alpha < ALPHA_MIN_VISIBLE)
+       if(this.alpha < ALPHA_MIN_VISIBLE)
        {
-               self.drawmask = 0;
-               Gib_Delete();
+               this.drawmask = 0;
+               Gib_Delete(this);
        }
 }
 
@@ -179,9 +181,9 @@ void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector
 
        gib.draw = Gib_Draw;
        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)
@@ -190,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;