Merge branch 'master' into terencehill/translate_colors_2

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / triggers / func / breakable.qc

diff --git a/qcsrc/common/triggers/func/breakable.qc b/qcsrc/common/triggers/func/breakable.qc
index b8b79975e41b97ac873a96bd249b8786c54f5806..feaf8785093d97b9663d67096ae3c8d22d853394 100644 (file)
--- a/qcsrc/common/triggers/func/breakable.qc
+++ b/qcsrc/common/triggers/func/breakable.qc
@@ -1,11 +1,11 @@
 #ifdef SVQC
 
-#include "../../../server/g_subs.qh"
-#include "../../../server/g_damage.qh"
-#include "../../../server/bot/bot.qh"
-#include "../../../common/csqcmodel_settings.qh"
-#include "../../../lib/csqcmodel/sv_model.qh"
-#include "../../../server/weapons/common.qh"
+#include <server/g_subs.qh>
+#include <server/g_damage.qh>
+#include <server/bot/bot.qh>
+#include <common/csqcmodel_settings.qh>
+#include <lib/csqcmodel/sv_model.qh>
+#include <server/weapons/common.qh>
 
 .entity sprite;
 
@@ -41,7 +41,7 @@
 //   Otherwise mdl_dead will be displayed at the map origin, and nobody would
 //   want that!
 
-void func_breakable_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force);
+void func_breakable_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force);
 
 //
 // func_breakable
@@ -50,11 +50,11 @@ void func_breakable_damage(entity inflictor, entity attacker, float damage, int
 void LaunchDebris (string debrisname, vector force)
 {SELFPARAM();
        entity dbr = spawn();
-       dbr.origin = self.absmin
+       vector org = self.absmin
                   + '1 0 0' * random() * (self.absmax.x - self.absmin.x)
                   + '0 1 0' * random() * (self.absmax.y - self.absmin.y)
                   + '0 0 1' * random() * (self.absmax.z - self.absmin.z);
-       setorigin(dbr, dbr.origin);
+       setorigin(dbr, org);
        _setmodel (dbr, debrisname );
        dbr.skin = self.debrisskin;
        dbr.colormap = self.colormap; // inherit team colors
@@ -226,42 +226,42 @@ void func_breakable_destroy()
        self.message = oldmsg;
 }
 
-void func_breakable_damage(entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
-{SELFPARAM();
-       if(self.state == 1)
+void func_breakable_damage(entity this, entity inflictor, entity attacker, float damage, int deathtype, vector hitloc, vector force)
+{
+       if(this.state == 1)
                return;
-       if(self.spawnflags & DOOR_NOSPLASH)
+       if(this.spawnflags & DOOR_NOSPLASH)
                if(!(DEATH_ISSPECIAL(deathtype)) && (deathtype & HITTYPE_SPLASH))
                        return;
-       if(self.team)
-               if(attacker.team == self.team)
+       if(this.team)
+               if(attacker.team == this.team)
                        return;
-       self.pain_finished = time;
-       self.health = self.health - damage;
-       if(self.sprite)
+       this.pain_finished = time;
+       this.health = this.health - damage;
+       if(this.sprite)
        {
-               WaypointSprite_Ping(self.sprite);
-               WaypointSprite_UpdateHealth(self.sprite, self.health);
+               WaypointSprite_Ping(this.sprite);
+               WaypointSprite_UpdateHealth(this.sprite, this.health);
        }
-       func_breakable_colormod();
+       WITHSELF(this, func_breakable_colormod());
 
-       if(self.health <= 0)
+       if(this.health <= 0)
        {
                debrisforce = force;
 
-               self.takedamage = DAMAGE_NO;
-               self.event_damage = func_null;
+               this.takedamage = DAMAGE_NO;
+               this.event_damage = func_null;
 
-               if(IS_CLIENT(attacker) && self.classname == "func_assault_destructible")
+               if(IS_CLIENT(attacker) && this.classname == "func_assault_destructible")
                {
-                       self.owner = attacker;
-                       self.realowner = attacker;
+                       this.owner = attacker;
+                       this.realowner = attacker;
                }
 
                // do not explode NOW but in the NEXT FRAME!
                // because recursive calls to RadiusDamage are not allowed
-               self.nextthink = time;
-               self.think = func_breakable_destroy;
+               this.nextthink = time;
+               this.think = func_breakable_destroy;
        }
 }