Notifications: strong references

[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 f7c14d9f6f492e3185139b7228b56e7fd46c6c38..e568acac1f9fe6a81d3f9833890e64c95070e994 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);
 
@@ -455,11 +455,11 @@ void W_RocketMinsta_Attack3 ()
 
                        W_Reload(self, used_ammo, SND(RELOAD));
                }
-               METHOD(Vaporizer, wr_suicidemessage, int(entity thiswep))
+               METHOD(Vaporizer, wr_suicidemessage, Notification(entity thiswep))
                {
                        return WEAPON_THINKING_WITH_PORTALS;
                }
-               METHOD(Vaporizer, wr_killmessage, int(entity thiswep))
+               METHOD(Vaporizer, wr_killmessage, Notification(entity thiswep))
                {
                        return WEAPON_VAPORIZER_MURDER;
                }