Merge branch 'master' into martin-t/dmgtext2

[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 ab86be4f8fee38dbac4285e31af5c33f0b841e4e..f22f0cedc6bc484378d84421f8e8c83342228d18 100644 (file)
--- a/qcsrc/common/weapons/weapon/devastator.qc
+++ b/qcsrc/common/weapons/weapon/devastator.qc
@@ -76,15 +76,11 @@ spawnfunc(weapon_rocketlauncher) { spawnfunc_weapon_devastator(this); }
 
 void W_Devastator_Unregister(entity this)
 {
-       if(this.realowner && this.realowner.lastrocket == this)
+       for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
        {
-               for(int slot = 0; slot < MAX_WEAPONSLOTS; ++slot)
-               {
-                       .entity weaponentity = weaponentities[slot];
-                       if(this.realowner.(weaponentity).lastrocket == this)
-                               this.realowner.(weaponentity).lastrocket = NULL;
-               }
-               // this.realowner.rl_release = 1;
+               .entity weaponentity = weaponentities[slot];
+               if(this.realowner.(weaponentity).lastrocket == this)
+                       this.realowner.(weaponentity).lastrocket = NULL;
        }
 }