]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Fix some references to the 'other' global
authorMario <mario@smbclan.net>
Mon, 10 Apr 2017 12:31:01 +0000 (22:31 +1000)
committerMario <mario@smbclan.net>
Mon, 10 Apr 2017 12:31:01 +0000 (22:31 +1000)
qcsrc/common/mutators/mutator/overkill/rpc.qc
qcsrc/common/weapons/weapon/vaporizer.qc

index 745b87f85349714f4ffe81241ebcbb50a9d920e4..a09a6a637c1da3306d46c6901536514ce8da2b4f 100644 (file)
@@ -55,7 +55,7 @@ void W_RocketPropelledChainsaw_Think(entity this)
 
        tracebox(this.origin, this.mins, this.maxs, this.origin + this.pos1 * (2 * this.wait), MOVE_NORMAL, this);
        if(IS_PLAYER(trace_ent))
-               Damage (trace_ent, this, this.realowner, WEP_CVAR(rpc, damage2), this.projectiledeathtype, this.origin, normalize(this.origin - other.origin) * WEP_CVAR(rpc, force));
+               Damage (trace_ent, this, this.realowner, WEP_CVAR(rpc, damage2), this.projectiledeathtype, this.origin, normalize(this.origin - trace_ent.origin) * WEP_CVAR(rpc, force));
 
        this.velocity = this.pos1 * (this.cnt + (WEP_CVAR(rpc, speedaccel) * sys_frametime));
 
index de2edbeefe8dfdfce43a75b548ad66cdd8929fa2..60e99348453033c02d2dd878c3121581abbeb6c6 100644 (file)
@@ -178,7 +178,7 @@ void W_RocketMinsta_Explosion(entity actor, vector loc)
        entity dmgent = spawn();
        dmgent.owner = dmgent.realowner = actor;
        setorigin(dmgent, loc);
-       RadiusDamage (dmgent, actor, autocvar_g_rm_damage, autocvar_g_rm_edgedamage, autocvar_g_rm_radius, NULL, NULL, autocvar_g_rm_force, WEP_DEVASTATOR.m_id | HITTYPE_SPLASH, other);
+       RadiusDamage (dmgent, actor, autocvar_g_rm_damage, autocvar_g_rm_edgedamage, autocvar_g_rm_radius, NULL, NULL, autocvar_g_rm_force, WEP_DEVASTATOR.m_id | HITTYPE_SPLASH, NULL);
        delete(dmgent);
 }