s/world/NULL/

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / monsters / monster / shambler.qc

diff --git a/qcsrc/common/monsters/monster/shambler.qc b/qcsrc/common/monsters/monster/shambler.qc
index 2e9384dc2adb0c37a78319c1ba6411e53328760f..7a11b139e446ca1847e261ce06fa0d19feaf5f81 100644 (file)
--- a/qcsrc/common/monsters/monster/shambler.qc
+++ b/qcsrc/common/monsters/monster/shambler.qc
@@ -93,7 +93,7 @@ void M_Shambler_Attack_Lightning_Explode(entity this)
        if(this.movetype == MOVETYPE_NONE)
                this.velocity = this.oldvelocity;
 
-       RadiusDamage (this, this.realowner, (autocvar_g_monster_shambler_attack_lightning_damage), (autocvar_g_monster_shambler_attack_lightning_damage), (autocvar_g_monster_shambler_attack_lightning_radius), world, world, (autocvar_g_monster_shambler_attack_lightning_force), this.projectiledeathtype, other);
+       RadiusDamage (this, this.realowner, (autocvar_g_monster_shambler_attack_lightning_damage), (autocvar_g_monster_shambler_attack_lightning_damage), (autocvar_g_monster_shambler_attack_lightning_radius), NULL, NULL, (autocvar_g_monster_shambler_attack_lightning_force), this.projectiledeathtype, other);
 
        for(head = findradius(this.origin, (autocvar_g_monster_shambler_attack_lightning_radius_zap)); head; head = head.chain) if(head != this.realowner) if(head.takedamage)
        {
@@ -128,7 +128,7 @@ void M_Shambler_Attack_Lightning_Touch(entity this)
 {
        PROJECTILE_TOUCH(this);
 
-       self.use(this, NULL, NULL);
+       this.use(this, NULL, NULL);
 }
 
 void M_Shambler_Attack_Lightning_Think(entity this)
@@ -136,7 +136,7 @@ void M_Shambler_Attack_Lightning_Think(entity this)
        this.nextthink = time;
        if (time > this.cnt)
        {
-               other = world;
+               other = NULL;
                M_Shambler_Attack_Lightning_Explode(this);
                return;
        }
@@ -236,12 +236,12 @@ METHOD(Shambler, mr_think, bool(Shambler this, entity actor))
     return true;
 }
 
-METHOD(Shambler, mr_pain, bool(Shambler this, entity actor))
+METHOD(Shambler, mr_pain, float(Shambler this, entity actor, float damage_take, entity attacker, float deathtype))
 {
     TC(Shambler, this);
     actor.pain_finished = time + 0.5;
     setanim(actor, actor.anim_pain1, true, true, false);
-    return true;
+    return damage_take;
 }
 
 METHOD(Shambler, mr_death, bool(Shambler this, entity actor))