Merge branch 'terencehill/lms_itemtimes_fix' into 'master'

[xonotic/xonotic-data.pk3dir.git] / qcsrc / common / weapons / weapon / vaporizer.qc

diff --git a/qcsrc/common/weapons/weapon/vaporizer.qc b/qcsrc/common/weapons/weapon/vaporizer.qc
index d3c47ee5fa031adf2caab63baef747aa9c3bf658..2ece549321f0a63abda2e02d825c7718d308ef30 100644 (file)
--- a/qcsrc/common/weapons/weapon/vaporizer.qc
+++ b/qcsrc/common/weapons/weapon/vaporizer.qc
@@ -118,7 +118,7 @@ void VaporizerBeam_Draw(entity this)
        //      rgb = e.glowmod;
        rgb *= (1 + autocvar_cl_vaporizerbeam_colorboost);
 
-       float fail = (self.nextthink - time);
+       float fail = (this.nextthink - time);
 
        Draw_VaporizerBeam_trace_callback_tex = tex;
        Draw_VaporizerBeam_trace_callback_rnd = 0;
@@ -217,7 +217,7 @@ void W_RocketMinsta_Laser_Explode ()
        if(other.takedamage == DAMAGE_AIM)
                if(IS_PLAYER(other))
                        if(DIFF_TEAM(self.realowner, other))
-                               if(other.deadflag == DEAD_NO)
+                               if(!IS_DEAD(other))
                                        if(IsFlying(other))
                                                Send_Notification(NOTIF_ONE, self.realowner, MSG_ANNCE, ANNCE_ACHIEVEMENT_ELECTROBITCH);
 
@@ -351,9 +351,9 @@ void W_RocketMinsta_Attack3 ()
                        float vaporizer_ammo = ((g_instagib) ? 1 : WEP_CVAR_PRI(vaporizer, ammo));
                        // if the laser uses load, we also consider its ammo for reloading
                        if(WEP_CVAR(vaporizer, reload_ammo) && WEP_CVAR_SEC(vaporizer, ammo) && actor.clip_load < min(vaporizer_ammo, WEP_CVAR_SEC(vaporizer, ammo))) { // forced reload
-                               thiswep.wr_reload(thiswep);
+                               thiswep.wr_reload(thiswep, actor, weaponentity);
                        } else if(WEP_CVAR(vaporizer, reload_ammo) && actor.clip_load < vaporizer_ammo) { // forced reload
-                               thiswep.wr_reload(thiswep);
+                               thiswep.wr_reload(thiswep, actor, weaponentity);
                        }
                        if((fire & 1) && (actor.ammo_cells || !autocvar_g_rm) && !forbidWeaponUse(actor))
                        {
@@ -444,7 +444,7 @@ void W_RocketMinsta_Attack3 ()
                {
                        self.vaporizer_lasthit = 0;
                }
-               METHOD(Vaporizer, wr_reload, void(entity thiswep))
+               METHOD(Vaporizer, wr_reload, void(entity thiswep, entity actor, .entity weaponentity))
                {
                        float vaporizer_ammo = ((g_instagib) ? 1 : WEP_CVAR_PRI(vaporizer, ammo));
                        float used_ammo;