Merge branch 'master' into Mario/snake

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

diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
index eb7d4787777c0435b67721dd874aff64a87592e7..5c4c338f155c5e91ad7272c5556de0c80f10c486 100644 (file)
--- a/qcsrc/client/gibs.qc
+++ b/qcsrc/client/gibs.qc
@@ -1,7 +1,19 @@
 #include "gibs.qh"
+#include "_all.qh"
+
+#include "rubble.qh"
+
+#include "../common/constants.qh"
+#include "../common/movetypes/movetypes.qh"
+#include "../common/util.qh"
+
+.float scale;
+.float alpha;
+.float cnt;
+.float gravity;
 
 void Gib_Delete()
-{
+{SELFPARAM();
        remove(self);
 }
 
@@ -30,9 +42,9 @@ void Gib_setmodel(entity gib, string mdlname, int specnum)
                        if(specnum != SPECIES_ROBOT_SOLID || mdlname == "models/gibs/chunk.mdl")
                        {
                                if(mdlname == "models/gibs/bloodyskull.md3")
-                                       setmodel(gib, "models/gibs/robo.md3");
+                                       setmodel(gib, MDL_GIB_ROBO);
                                else
-                                       setmodel(gib, strcat("models/gibs/robo", ftos(floor(random() * 8) + 1), ".md3"));
+                                       setmodel(gib, MDL_GIB_ROBO_RANDOM());
                                if(specnum == SPECIES_ROBOT_SHINY)
                                {
                                        gib.skin = 1;
@@ -42,7 +54,7 @@ void Gib_setmodel(entity gib, string mdlname, int specnum)
                                break;
                        }
                default:
-                       setmodel(gib, mdlname);
+                       _setmodel(gib, mdlname);
                        gib.skin = specnum;
                        break;
        }
@@ -63,7 +75,7 @@ void SUB_RemoveOnNoImpact()
 }
 
 void Gib_Touch()
-{
+{SELFPARAM();
        // TODO maybe bounce of walls, make more gibs, etc.
 
        if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
@@ -73,14 +85,14 @@ void Gib_Touch()
        }
 
        if(!self.silent)
-               sound(self, CH_PAIN, strcat("misc/gib_splat0", ftos(floor(prandom() * 4 + 1)), ".wav"), VOL_BASE, ATTEN_NORM);
-       pointparticles(particleeffectnum(strcat(species_prefix(self.cnt), "blood")), self.origin + '0 0 1', '0 0 30', 10);
+               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);
 
        Gib_Delete();
 }
 
 void Gib_Draw()
-{
+{SELFPARAM();
        vector oldorg;
        oldorg = self.origin;
 
@@ -90,9 +102,9 @@ void Gib_Draw()
 
        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), "TR_SLIGHTBLOOD")), oldorg, self.origin);
+               trailparticles(self, _particleeffectnum(strcat(species_prefix(self.cnt), EFFECT_TR_SLIGHTBLOOD.eent_eff_name)), oldorg, self.origin);
        else
-               trailparticles(self, particleeffectnum(strcat(species_prefix(self.cnt), "TR_BLOOD")), oldorg, self.origin);
+               trailparticles(self, _particleeffectnum(strcat(species_prefix(self.cnt), EFFECT_TR_BLOOD.eent_eff_name)), oldorg, self.origin);
 
        self.renderflags = 0;
 
@@ -152,7 +164,7 @@ void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector
 }
 
 void Ent_GibSplash(bool isNew)
-{
+{SELFPARAM();
        int amount, type, specnum;
        vector org, vel;
        string specstr;
@@ -206,11 +218,11 @@ void Ent_GibSplash(bool isNew)
        {
                case 0x01:
                        if(!issilent)
-                               sound (self, CH_PAIN, "misc/gib.wav", VOL_BASE, ATTEN_NORM);
+                               sound (self, CH_PAIN, SND_GIB, VOL_BASE, ATTEN_NORM);
 
                        if(prandom() < amount)
                                TossGib ("models/gibs/eye.md3", org, org, vel, prandomvec() * 150, specnum, 0, issilent);
-                       new_te_bloodshower(particleeffectnum(strcat(specstr, "bloodshower")), org, 1200, amount);
+                       new_te_bloodshower(_particleeffectnum(strcat(specstr, "bloodshower")), org, 1200, amount);
                        if(prandom() < amount)
                                TossGib ("models/gibs/bloodyskull.md3", org, org + 16 * prandomvec(), vel, prandomvec() * 100, specnum, 0, issilent);
 
@@ -243,48 +255,20 @@ void Ent_GibSplash(bool isNew)
                        }
                        break;
                case 0x02:
-                       pointparticles(particleeffectnum(strcat(specstr, "blood")), org, vel, amount * 16);
+                       pointparticles(_particleeffectnum(strcat(specstr, "blood")), org, vel, amount * 16);
                        break;
                case 0x03:
                        if(prandom() < amount)
                                TossGib ("models/gibs/chunk.mdl", org, org, vel, prandomvec() * (prandom() * 30 + 20), specnum, 1, issilent); // TODO maybe adjust to more randomization?
                        break;
                case 0x81:
-                       pointparticles(particleeffectnum(strcat(gentle_prefix, "damage_dissolve")), org, vel, amount);
+                       pointparticles(_particleeffectnum(strcat(gentle_prefix, "damage_dissolve")), org, vel, amount);
                        break;
                case 0x82:
-                       pointparticles(particleeffectnum(strcat(gentle_prefix, "damage_hit")), org, vel, amount * 16);
+                       pointparticles(_particleeffectnum(strcat(gentle_prefix, "damage_hit")), org, vel, amount * 16);
                        break;
                case 0x83:
                        // no gibs in gentle mode, sorry
                        break;
        }
 }
-
-void GibSplash_Precache()
-{
-       precache_model("models/gibs/chunk.mdl");
-       precache_model("models/gibs/leg1.md3");
-       precache_model("models/gibs/leg2.md3");
-       precache_model("models/gibs/chest.md3");
-       precache_model("models/gibs/smallchest.md3");
-       precache_model("models/gibs/arm.md3");
-       precache_model("models/gibs/bloodyskull.md3");
-       precache_model("models/gibs/eye.md3");
-
-       precache_model("models/gibs/robo.md3");
-       precache_model("models/gibs/robo1.md3");
-       precache_model("models/gibs/robo2.md3");
-       precache_model("models/gibs/robo3.md3");
-       precache_model("models/gibs/robo4.md3");
-       precache_model("models/gibs/robo5.md3");
-       precache_model("models/gibs/robo6.md3");
-       precache_model("models/gibs/robo7.md3");
-       precache_model("models/gibs/robo8.md3");
-
-       precache_sound ("misc/gib.wav");
-    precache_sound ("misc/gib_splat01.wav");
-    precache_sound ("misc/gib_splat02.wav");
-    precache_sound ("misc/gib_splat03.wav");
-    precache_sound ("misc/gib_splat04.wav");
-}