Merge branch 'master' into TimePath/items

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

diff --git a/qcsrc/common/weapons/weapon/devastator.qc b/qcsrc/common/weapons/weapon/devastator.qc
index 47ab6460af4d7dfdc7fc0b444c83750b329bc11a..f5aed7b40d6914d2c1db8a9267bbddb34e82a7ea 100644 (file)
--- a/qcsrc/common/weapons/weapon/devastator.qc
+++ b/qcsrc/common/weapons/weapon/devastator.qc
@@ -67,6 +67,8 @@ DEVASTATOR_SETTINGS(WEP_ADD_CVAR, WEP_ADD_PROP)
 spawnfunc(weapon_devastator) { weapon_defaultspawnfunc(this, WEP_DEVASTATOR); }
 spawnfunc(weapon_rocketlauncher) { spawnfunc_weapon_devastator(this); }
 
+.entity lastrocket;
+
 void W_Devastator_Unregister(void)
 {SELFPARAM();
        if(self.realowner && self.realowner.lastrocket == self)
@@ -609,6 +611,7 @@ void W_Devastator_Attack(Weapon thiswep)
                }
                METHOD(Devastator, wr_resetplayer, void(entity thiswep))
                {
+                       self.lastrocket = NULL; // stop rocket guiding, no revenge from the grave!
                        self.rl_release = 0;
                }
                METHOD(Devastator, wr_reload, void(entity thiswep))