]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Gibs: move to qc effects
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 5 Nov 2015 11:32:42 +0000 (22:32 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 5 Nov 2015 11:32:42 +0000 (22:32 +1100)
qcsrc/client/damage.qc
qcsrc/client/gibs.qc [deleted file]
qcsrc/client/gibs.qh [deleted file]
qcsrc/client/main.qc
qcsrc/client/progs.inc
qcsrc/common/effects/qc/all.inc
qcsrc/common/effects/qc/gibs.qc [new file with mode: 0644]
qcsrc/server/cl_player.qc
qcsrc/server/g_violence.qc [deleted file]
qcsrc/server/g_violence.qh [deleted file]
qcsrc/server/progs.inc

index a0c16961075a9fa58e8074c39535a04f3f3452e5..fe99d507b7e49dc27068cded9aac8820ac15fed3 100644 (file)
@@ -1,6 +1,5 @@
 #include "damage.qh"
 
-#include "gibs.qh"
 #include "../common/deathtypes/all.qh"
 #include "../common/movetypes/movetypes.qh"
 #include "../common/vehicles/all.qh"
@@ -45,6 +44,21 @@ void DamageEffect_Think()
        __pointparticles(self.team, org, '0 0 0', 1);
 }
 
+string species_prefix(int specnum)
+{
+       switch(specnum)
+       {
+               case SPECIES_HUMAN:       return "";
+               case SPECIES_ALIEN:       return "alien_";
+               case SPECIES_ROBOT_SHINY: return "robot_";
+               case SPECIES_ROBOT_RUSTY: return "robot_"; // use the same effects, only different gibs
+               case SPECIES_ROBOT_SOLID: return "robot_"; // use the same effects, only different gibs
+               case SPECIES_ANIMAL:      return "animal_";
+               case SPECIES_RESERVED:    return "reserved_";
+               default:         return "";
+       }
+}
+
 void DamageEffect(vector hitorg, float thedamage, int type, int specnum)
 {SELFPARAM();
        // particle effects for players and objects damaged by weapons (eg: flames coming out of victims shot with rockets)
diff --git a/qcsrc/client/gibs.qc b/qcsrc/client/gibs.qc
deleted file mode 100644 (file)
index 675cd40..0000000
+++ /dev/null
@@ -1,270 +0,0 @@
-#include "gibs.qh"
-
-#include "rubble.qh"
-#include "../common/movetypes/movetypes.qh"
-
-.float scale;
-.float alpha;
-.float cnt;
-.float gravity;
-
-void Gib_Delete()
-{SELFPARAM();
-       remove(self);
-}
-
-string species_prefix(int specnum)
-{
-       switch(specnum)
-       {
-               case SPECIES_HUMAN:       return "";
-               case SPECIES_ALIEN:       return "alien_";
-               case SPECIES_ROBOT_SHINY: return "robot_";
-               case SPECIES_ROBOT_RUSTY: return "robot_"; // use the same effects, only different gibs
-               case SPECIES_ROBOT_SOLID: return "robot_"; // use the same effects, only different gibs
-               case SPECIES_ANIMAL:      return "animal_";
-               case SPECIES_RESERVED:    return "reserved_";
-               default:         return "";
-       }
-}
-
-void Gib_setmodel(entity gib, string mdlname, int specnum)
-{
-       switch(specnum)
-       {
-               case SPECIES_ROBOT_RUSTY:
-               case SPECIES_ROBOT_SHINY:
-               case SPECIES_ROBOT_SOLID:
-                       if(specnum != SPECIES_ROBOT_SOLID || mdlname == "models/gibs/chunk.mdl")
-                       {
-                               if(mdlname == "models/gibs/bloodyskull.md3")
-                                       setmodel(gib, MDL_GIB_ROBO);
-                               else
-                                       setmodel(gib, MDL_GIB_ROBO_RANDOM());
-                               if(specnum == SPECIES_ROBOT_SHINY)
-                               {
-                                       gib.skin = 1;
-                                       gib.colormod = '2 2 2';
-                               }
-                               gib.scale = 1;
-                               break;
-                       }
-               default:
-                       _setmodel(gib, mdlname);
-                       gib.skin = specnum;
-                       break;
-       }
-}
-
-void new_te_bloodshower (int ef, vector org, float explosionspeed, int howmany)
-{
-       float i, pmod;
-       pmod = autocvar_cl_particles_quality;
-       for (i = 0; i < 50 * pmod; ++i)
-               __pointparticles(ef, org, randomvec() * explosionspeed, howmany / 50);
-}
-
-void SUB_RemoveOnNoImpact()
-{
-       if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
-               Gib_Delete();
-}
-
-void Gib_Touch()
-{SELFPARAM();
-       // TODO maybe bounce of walls, make more gibs, etc.
-
-       if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
-       {
-               Gib_Delete();
-               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);
-
-       Gib_Delete();
-}
-
-void Gib_Draw(entity this)
-{
-       vector oldorg;
-       oldorg = self.origin;
-
-       Movetype_Physics_MatchTicrate(autocvar_cl_gibs_ticrate, autocvar_cl_gibs_sloppy);
-       if(wasfreed(self))
-               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);
-       else
-               __trailparticles(self, _particleeffectnum(strcat(species_prefix(self.cnt), EFFECT_TR_BLOOD.eent_eff_name)), oldorg, self.origin);
-
-       self.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);
-
-       self.alpha = bound(0, self.nextthink - time, 1);
-
-       if(self.alpha < ALPHA_MIN_VISIBLE)
-       {
-               self.drawmask = 0;
-               Gib_Delete();
-       }
-}
-
-void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector vrand, int specnum, bool destroyontouch, bool issilent)
-{
-       entity gib;
-
-       // TODO remove some gibs according to cl_nogibs
-       gib = RubbleNew("gib");
-       gib.move_movetype = MOVETYPE_BOUNCE;
-       gib.gravity = 1;
-       gib.solid = SOLID_CORPSE;
-       gib.cnt = specnum;
-       gib.silent = issilent;
-       Gib_setmodel(gib, mdlname, specnum);
-
-       setsize (gib, '-8 -8 -8', '8 8 8');
-
-       gib.draw = Gib_Draw;
-       if(destroyontouch)
-               gib.move_touch = Gib_Touch;
-       else
-               gib.move_touch = SUB_RemoveOnNoImpact;
-
-       // don't spawn gibs inside solid - just don't
-       if(org != safeorg)
-       {
-               tracebox(safeorg, gib.mins, gib.maxs, org, MOVE_NOMONSTERS, gib);
-               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.move_time = time;
-       gib.damageforcescale = autocvar_cl_gibs_damageforcescale;
-
-       gib.nextthink = time + autocvar_cl_gibs_lifetime * (1 + prandom() * 0.15);
-       gib.drawmask = MASK_NORMAL;
-
-       RubbleLimit("gib", autocvar_cl_gibs_maxcount, Gib_Delete);
-}
-
-REGISTER_NET_TEMP(net_gibsplash)
-
-NET_HANDLE(net_gibsplash, bool isNew)
-{
-       Net_Accept(net_gibsplash);
-
-       string gentle_prefix = "morphed_";
-
-       int type = ReadByte(); // gibbage type
-       int amount = ReadByte() / 16.0; // gibbage amount
-       vector org;
-       org.x = ReadShort() * 4 + 2;
-       org.y = ReadShort() * 4 + 2;
-       org.z = ReadShort() * 4 + 2;
-       vector vel = decompressShortVector(ReadShort());
-
-       return = true;
-
-       float cl_gentle_gibs = autocvar_cl_gentle_gibs;
-       if(cl_gentle_gibs || autocvar_cl_gentle)
-               type |= 0x80; // set gentle bit
-
-       if(type & 0x80)
-       {
-               if(cl_gentle_gibs == 2)
-                       gentle_prefix = "";
-               else if(cl_gentle_gibs == 3)
-                       gentle_prefix = "happy_";
-       }
-       else if(autocvar_cl_particlegibs)
-       {
-               type |= 0x80;
-               gentle_prefix = "particlegibs_";
-       }
-
-       if (!(cl_gentle_gibs || autocvar_cl_gentle))
-               amount *= 1 - autocvar_cl_nogibs;
-
-       if(autocvar_ekg)
-               amount *= 5;
-
-       if(amount <= 0 || !isNew)
-               return;
-
-       setorigin(this, org); // for the sounds
-
-       int specnum = (type & 0x78) / 8; // blood/gibmodel type: using four bits (0..7, bit indexes 3,4,5)
-       bool issilent = (type & 0x40);
-       type = type & 0x87; // remove the species bits: bit 7 = gentle, bit 0,1,2 = kind of gib
-       string specstr = species_prefix(specnum);
-
-       switch(type)
-       {
-               case 0x01:
-                       if(!issilent)
-                               sound (this, 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);
-                       if(prandom() < amount)
-                               TossGib ("models/gibs/bloodyskull.md3", org, org + 16 * prandomvec(), vel, prandomvec() * 100, specnum, 0, issilent);
-
-                       for(int c = 0; c < amount; ++c)
-                       {
-                               int randomvalue = amount - c;
-
-                               if(prandom() < randomvalue)
-                                       TossGib ("models/gibs/arm.md3", org, org + 16 * prandomvec() + '0 0 8', vel, prandomvec() * (prandom() * 120 + 90), specnum,0, issilent);
-                               if(prandom() < randomvalue)
-                                       TossGib ("models/gibs/arm.md3", org, org + 16 * prandomvec() + '0 0 8', vel, prandomvec() * (prandom() * 120 + 90), specnum,0, issilent);
-                               if(prandom() < randomvalue)
-                                       TossGib ("models/gibs/chest.md3", org, org + 16 * prandomvec(), vel, prandomvec() * (prandom() * 120 + 80), specnum,0, issilent);
-                               if(prandom() < randomvalue)
-                                       TossGib ("models/gibs/smallchest.md3", org, org + 16 * prandomvec(), vel, prandomvec() * (prandom() * 120 + 80), specnum,0, issilent);
-                               if(prandom() < randomvalue)
-                                       TossGib ("models/gibs/leg1.md3", org, org + 16 * prandomvec() + '0 0 -5', vel, prandomvec() * (prandom() * 120 + 85), specnum,0, issilent);
-                               if(prandom() < randomvalue)
-                                       TossGib ("models/gibs/leg2.md3", org, org + 16 * prandomvec() + '0 0 -5', vel, prandomvec() * (prandom() * 120 + 85), specnum,0, issilent);
-
-                               // these splat on impact
-                               if(prandom() < randomvalue)
-                                       TossGib ("models/gibs/chunk.mdl", org, org + 16 * prandomvec(), vel, prandomvec() * 450, specnum,1, issilent);
-                               if(prandom() < randomvalue)
-                                       TossGib ("models/gibs/chunk.mdl", org, org + 16 * prandomvec(), vel, prandomvec() * 450, specnum,1, issilent);
-                               if(prandom() < randomvalue)
-                                       TossGib ("models/gibs/chunk.mdl", org, org + 16 * prandomvec(), vel, prandomvec() * 450, specnum,1, issilent);
-                               if(prandom() < randomvalue)
-                                       TossGib ("models/gibs/chunk.mdl", org, org + 16 * prandomvec(), vel, prandomvec() * 450, specnum,1, issilent);
-                       }
-                       break;
-               case 0x02:
-                       __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);
-                       break;
-               case 0x82:
-                       __pointparticles(_particleeffectnum(strcat(gentle_prefix, "damage_hit")), org, vel, amount * 16);
-                       break;
-               case 0x83:
-                       // no gibs in gentle mode, sorry
-                       break;
-       }
-       remove(this);
-}
diff --git a/qcsrc/client/gibs.qh b/qcsrc/client/gibs.qh
deleted file mode 100644 (file)
index 69058f6..0000000
+++ /dev/null
@@ -1,24 +0,0 @@
-#ifndef CLIENT_GIBS_H
-#define CLIENT_GIBS_H
-
-.vector colormod;
-
-.bool silent;
-
-void Gib_Delete();
-
-string species_prefix(int specnum);
-
-void Gib_setmodel(entity gib, string mdlname, int specnum);
-
-void new_te_bloodshower (int ef, vector org, float explosionspeed, int howmany);
-
-void SUB_RemoveOnNoImpact();
-
-void Gib_Touch();
-
-void Gib_Draw(entity this);
-
-void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector vrand, int specnum, bool destroyontouch, bool issilent);
-
-#endif
index bb522b4adc166b2399a7e3722b9dc7253aa5eae5..d205284c7d80105afbb3e4045d688e71d6317564 100644 (file)
@@ -2,7 +2,6 @@
 
 #include "damage.qh"
 #include "../common/effects/qc/all.qh"
-#include "gibs.qh"
 #include "hook.qh"
 #include "hud/all.qh"
 #include "mapvoting.qh"
index a4eee1c73d21011292f04978a2ee17ded3461a70..84e596c9471c8a13e6c04bb9863b94ac5d75ed89 100644 (file)
@@ -1,12 +1,12 @@
 #include "../lib/_all.inc"
 #include "_all.qh"
 
+#include "../common/effects/qc/all.qc"
+
 #include "announcer.qc"
 #include "bgmscript.qc"
 #include "csqcmodel_hooks.qc"
 #include "damage.qc"
-#include "../common/effects/qc/all.qc"
-#include "gibs.qc"
 #include "hook.qc"
 #include "hud/all.qc"
 #include "main.qc"
index 7b0639610b9fef2dffcc731d8d8d3251f1bb4023..33aa1ccb8617027d8bc6d50dfba04d05866c54c3 100644 (file)
@@ -1,2 +1,3 @@
 #include "casings.qc"
+#include "gibs.qc"
 #include "lightningarc.qc"
diff --git a/qcsrc/common/effects/qc/gibs.qc b/qcsrc/common/effects/qc/gibs.qc
new file mode 100644 (file)
index 0000000..ab8dbb8
--- /dev/null
@@ -0,0 +1,316 @@
+#ifdef IMPLEMENTATION
+REGISTER_NET_TEMP(net_gibsplash)
+
+#ifdef SVQC
+
+.int state;
+
+bool Violence_GibSplash_SendEntity(entity this, entity to, int sf)
+{
+       int channel = MSG_ONE;
+       msg_entity = to;
+       WriteHeader(channel, net_gibsplash);
+       WriteByte(channel, this.state); // actually type
+       WriteByte(channel, bound(1, this.cnt * 16, 255)); // gibbage amount multiplier
+       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
+       return true;
+}
+
+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;
+
+       entity e = new(gibsplash);
+       e.cnt = amount;
+       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
+
+       // 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 = num_for_edict(self.enemy);
+       else
+               e.team = num_for_edict(self);
+
+       setorigin(e, org);
+       e.velocity = dir;
+
+       e.oldorigin_x = compressShortVector(e.velocity);
+
+       entity cl; FOR_EACH_REALCLIENT(cl) Violence_GibSplash_SendEntity(e, cl, 0);
+       remove(e);
+}
+
+void Violence_GibSplash(entity source, float type, float amount, entity attacker)
+{
+       Violence_GibSplash_At(source.origin + source.view_ofs, source.velocity, type, amount, source, attacker);
+}
+#endif
+
+#ifdef CSQC
+
+.vector colormod;
+.bool silent;
+
+#include "rubble.qh"
+#include "../common/movetypes/movetypes.qh"
+
+.float scale;
+.float alpha;
+.float cnt;
+.float gravity;
+
+void Gib_Delete()
+{SELFPARAM();
+       remove(self);
+}
+
+string species_prefix(int specnum);
+
+void Gib_setmodel(entity gib, string mdlname, int specnum)
+{
+       switch(specnum)
+       {
+               case SPECIES_ROBOT_RUSTY:
+               case SPECIES_ROBOT_SHINY:
+               case SPECIES_ROBOT_SOLID:
+                       if(specnum != SPECIES_ROBOT_SOLID || mdlname == "models/gibs/chunk.mdl")
+                       {
+                               if(mdlname == "models/gibs/bloodyskull.md3")
+                                       setmodel(gib, MDL_GIB_ROBO);
+                               else
+                                       setmodel(gib, MDL_GIB_ROBO_RANDOM());
+                               if(specnum == SPECIES_ROBOT_SHINY)
+                               {
+                                       gib.skin = 1;
+                                       gib.colormod = '2 2 2';
+                               }
+                               gib.scale = 1;
+                               break;
+                       }
+               default:
+                       _setmodel(gib, mdlname);
+                       gib.skin = specnum;
+                       break;
+       }
+}
+
+void new_te_bloodshower (int ef, vector org, float explosionspeed, int howmany)
+{
+       float i, pmod;
+       pmod = autocvar_cl_particles_quality;
+       for (i = 0; i < 50 * pmod; ++i)
+               __pointparticles(ef, org, randomvec() * explosionspeed, howmany / 50);
+}
+
+void SUB_RemoveOnNoImpact()
+{
+       if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
+               Gib_Delete();
+}
+
+void Gib_Touch()
+{SELFPARAM();
+       // TODO maybe bounce of walls, make more gibs, etc.
+
+       if(trace_dphitq3surfaceflags & Q3SURFACEFLAG_NOIMPACT)
+       {
+               Gib_Delete();
+               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);
+
+       Gib_Delete();
+}
+
+void Gib_Draw(entity this)
+{
+       vector oldorg;
+       oldorg = self.origin;
+
+       Movetype_Physics_MatchTicrate(autocvar_cl_gibs_ticrate, autocvar_cl_gibs_sloppy);
+       if(wasfreed(self))
+               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);
+       else
+               __trailparticles(self, _particleeffectnum(strcat(species_prefix(self.cnt), EFFECT_TR_BLOOD.eent_eff_name)), oldorg, self.origin);
+
+       self.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);
+
+       self.alpha = bound(0, self.nextthink - time, 1);
+
+       if(self.alpha < ALPHA_MIN_VISIBLE)
+       {
+               self.drawmask = 0;
+               Gib_Delete();
+       }
+}
+
+void TossGib (string mdlname, vector safeorg, vector org, vector vconst, vector vrand, int specnum, bool destroyontouch, bool issilent)
+{
+       entity gib;
+
+       // TODO remove some gibs according to cl_nogibs
+       gib = RubbleNew("gib");
+       gib.move_movetype = MOVETYPE_BOUNCE;
+       gib.gravity = 1;
+       gib.solid = SOLID_CORPSE;
+       gib.cnt = specnum;
+       gib.silent = issilent;
+       Gib_setmodel(gib, mdlname, specnum);
+
+       setsize (gib, '-8 -8 -8', '8 8 8');
+
+       gib.draw = Gib_Draw;
+       if(destroyontouch)
+               gib.move_touch = Gib_Touch;
+       else
+               gib.move_touch = SUB_RemoveOnNoImpact;
+
+       // don't spawn gibs inside solid - just don't
+       if(org != safeorg)
+       {
+               tracebox(safeorg, gib.mins, gib.maxs, org, MOVE_NOMONSTERS, gib);
+               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.move_time = time;
+       gib.damageforcescale = autocvar_cl_gibs_damageforcescale;
+
+       gib.nextthink = time + autocvar_cl_gibs_lifetime * (1 + prandom() * 0.15);
+       gib.drawmask = MASK_NORMAL;
+
+       RubbleLimit("gib", autocvar_cl_gibs_maxcount, Gib_Delete);
+}
+
+NET_HANDLE(net_gibsplash, bool isNew)
+{
+       Net_Accept(net_gibsplash);
+
+       string gentle_prefix = "morphed_";
+
+       int type = ReadByte(); // gibbage type
+       int amount = ReadByte() / 16.0; // gibbage amount
+       vector org;
+       org.x = ReadShort() * 4 + 2;
+       org.y = ReadShort() * 4 + 2;
+       org.z = ReadShort() * 4 + 2;
+       vector vel = decompressShortVector(ReadShort());
+
+       return = true;
+
+       float cl_gentle_gibs = autocvar_cl_gentle_gibs;
+       if(cl_gentle_gibs || autocvar_cl_gentle)
+               type |= 0x80; // set gentle bit
+
+       if(type & 0x80)
+       {
+               if(cl_gentle_gibs == 2)
+                       gentle_prefix = "";
+               else if(cl_gentle_gibs == 3)
+                       gentle_prefix = "happy_";
+       }
+       else if(autocvar_cl_particlegibs)
+       {
+               type |= 0x80;
+               gentle_prefix = "particlegibs_";
+       }
+
+       if (!(cl_gentle_gibs || autocvar_cl_gentle))
+               amount *= 1 - autocvar_cl_nogibs;
+
+       if(autocvar_ekg)
+               amount *= 5;
+
+       if(amount <= 0 || !isNew)
+               return;
+
+       setorigin(this, org); // for the sounds
+
+       int specnum = (type & 0x78) / 8; // blood/gibmodel type: using four bits (0..7, bit indexes 3,4,5)
+       bool issilent = (type & 0x40);
+       type = type & 0x87; // remove the species bits: bit 7 = gentle, bit 0,1,2 = kind of gib
+       string specstr = species_prefix(specnum);
+
+       switch(type)
+       {
+               case 0x01:
+                       if(!issilent)
+                               sound (this, 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);
+                       if(prandom() < amount)
+                               TossGib ("models/gibs/bloodyskull.md3", org, org + 16 * prandomvec(), vel, prandomvec() * 100, specnum, 0, issilent);
+
+                       for(int c = 0; c < amount; ++c)
+                       {
+                               int randomvalue = amount - c;
+
+                               if(prandom() < randomvalue)
+                                       TossGib ("models/gibs/arm.md3", org, org + 16 * prandomvec() + '0 0 8', vel, prandomvec() * (prandom() * 120 + 90), specnum,0, issilent);
+                               if(prandom() < randomvalue)
+                                       TossGib ("models/gibs/arm.md3", org, org + 16 * prandomvec() + '0 0 8', vel, prandomvec() * (prandom() * 120 + 90), specnum,0, issilent);
+                               if(prandom() < randomvalue)
+                                       TossGib ("models/gibs/chest.md3", org, org + 16 * prandomvec(), vel, prandomvec() * (prandom() * 120 + 80), specnum,0, issilent);
+                               if(prandom() < randomvalue)
+                                       TossGib ("models/gibs/smallchest.md3", org, org + 16 * prandomvec(), vel, prandomvec() * (prandom() * 120 + 80), specnum,0, issilent);
+                               if(prandom() < randomvalue)
+                                       TossGib ("models/gibs/leg1.md3", org, org + 16 * prandomvec() + '0 0 -5', vel, prandomvec() * (prandom() * 120 + 85), specnum,0, issilent);
+                               if(prandom() < randomvalue)
+                                       TossGib ("models/gibs/leg2.md3", org, org + 16 * prandomvec() + '0 0 -5', vel, prandomvec() * (prandom() * 120 + 85), specnum,0, issilent);
+
+                               // these splat on impact
+                               if(prandom() < randomvalue)
+                                       TossGib ("models/gibs/chunk.mdl", org, org + 16 * prandomvec(), vel, prandomvec() * 450, specnum,1, issilent);
+                               if(prandom() < randomvalue)
+                                       TossGib ("models/gibs/chunk.mdl", org, org + 16 * prandomvec(), vel, prandomvec() * 450, specnum,1, issilent);
+                               if(prandom() < randomvalue)
+                                       TossGib ("models/gibs/chunk.mdl", org, org + 16 * prandomvec(), vel, prandomvec() * 450, specnum,1, issilent);
+                               if(prandom() < randomvalue)
+                                       TossGib ("models/gibs/chunk.mdl", org, org + 16 * prandomvec(), vel, prandomvec() * 450, specnum,1, issilent);
+                       }
+                       break;
+               case 0x02:
+                       __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);
+                       break;
+               case 0x82:
+                       __pointparticles(_particleeffectnum(strcat(gentle_prefix, "damage_hit")), org, vel, amount * 16);
+                       break;
+               case 0x83:
+                       // no gibs in gentle mode, sorry
+                       break;
+       }
+       remove(this);
+}
+#endif
+
+#endif
index d6aa84ea1aa2b3f557c8d4879198135f275f70ba..84e905e85fea28e858763e3932a21bc2c09ad2d7 100644 (file)
@@ -4,7 +4,6 @@
 #include "cheats.qh"
 #include "g_damage.qh"
 #include "g_subs.qh"
-#include "g_violence.qh"
 #include "miscfunctions.qh"
 #include "portals.qh"
 #include "teamplay.qh"
diff --git a/qcsrc/server/g_violence.qc b/qcsrc/server/g_violence.qc
deleted file mode 100644 (file)
index 688fa1d..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-#include "g_violence.qh"
-
-.int state;
-
-REGISTER_NET_TEMP(net_gibsplash)
-
-bool Violence_GibSplash_SendEntity(entity this, entity to, int sf)
-{
-       int channel = MSG_ONE;
-       msg_entity = to;
-       WriteHeader(channel, net_gibsplash);
-       WriteByte(channel, this.state); // actually type
-       WriteByte(channel, bound(1, this.cnt * 16, 255)); // gibbage amount multiplier
-       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
-       return true;
-}
-
-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;
-
-       entity e = new(gibsplash);
-       e.cnt = amount;
-       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
-
-       // 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 = num_for_edict(self.enemy);
-       else
-               e.team = num_for_edict(self);
-
-       setorigin(e, org);
-       e.velocity = dir;
-
-       e.oldorigin_x = compressShortVector(e.velocity);
-
-       entity cl; FOR_EACH_REALCLIENT(cl) Violence_GibSplash_SendEntity(e, cl, 0);
-       remove(e);
-}
-
-void Violence_GibSplash(entity source, float type, float amount, entity attacker)
-{
-       Violence_GibSplash_At(source.origin + source.view_ofs, source.velocity, type, amount, source, attacker);
-}
diff --git a/qcsrc/server/g_violence.qh b/qcsrc/server/g_violence.qh
deleted file mode 100644 (file)
index 6a33ac4..0000000
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef G_VIOLENCE_H
-#define G_VIOLENCE_H
-
-bool Violence_GibSplash_SendEntity(entity this, entity to, int sf);
-
-// TODO maybe convert this to a TE?
-void Violence_GibSplash_At(vector org, vector dir, float type, float amount, entity gibowner, entity attacker);
-
-void Violence_GibSplash(entity source, float type, float amount, entity attacker);
-#endif
index 6fd58e707626ca94baef223eea21d6efe2a54ac6..6ab895f21f9cd7936f78869e630d70b8b1a9f3b9 100644 (file)
@@ -1,6 +1,8 @@
 #include "../lib/_all.inc"
 #include "_all.qh"
 
+#include "../common/effects/qc/all.qc"
+
 #include "anticheat.qc"
 #include "antilag.qc"
 #include "campaign.qc"
 #include "cl_client.qc"
 #include "cl_impulse.qc"
 #include "cl_player.qc"
-#include "../common/effects/qc/all.qc"
 #include "ent_cs.qc"
 #include "g_damage.qc"
 #include "g_hook.qc"
 // #include "g_lights.qc" // TODO: was never used
 #include "g_models.qc"
 #include "g_subs.qc"
-#include "g_violence.qc"
 #include "g_world.qc"
 #include "ipban.qc"
 #include "item_key.qc"