]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Revert "Filter out Overkill weapons from weapon impulse alias creation" Mario/weapon_impulse_exclusion 1474/head
authorMario <mario.mario@y7mail.com>
Fri, 25 Apr 2025 17:32:10 +0000 (03:32 +1000)
committerMario <mario.mario@y7mail.com>
Fri, 25 Apr 2025 17:32:10 +0000 (03:32 +1000)
This reverts commit df5e7bc623e36277ef1731a4f2be0b9dd2d495cc.

qcsrc/common/weapons/all.qh

index 2b6d4128d10409607aebbbdb1b4fd2f6ebdd29ff..85b95243f2e9e84a1d41aa9fc164630c40567090 100644 (file)
@@ -344,8 +344,8 @@ STATIC_INIT(register_weapons_done)
                if (it.spawnflags & WEP_FLAG_SUPERWEAPON) WEPSET_SUPERWEAPONS |= set;
                if (it == WEP_Null) continue;
                if (it.spawnflags & WEP_FLAG_SPECIALATTACK) continue;
-               // TODO: this exists to filter out the Overkill mutator weapons, see issue #2268
-               if ((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && (it.spawnflags & WEP_FLAG_HIDDEN)) continue;
+               // TODO: this exists to filter out the Ball Stealer, otherwise we run out of impulses
+               if ((it.spawnflags & WEP_FLAG_MUTATORBLOCKED) && (it.spawnflags & WEP_TYPE_OTHER)) continue;
 
                it.m_unique_impulse = imp;
                if (imp <= WEP_IMPULSE_END)