From: Mario Date: Fri, 25 Apr 2025 17:32:10 +0000 (+1000) Subject: Revert "Filter out Overkill weapons from weapon impulse alias creation" X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=refs%2Fmerge-requests%2F1474%2Fhead;p=xonotic%2Fxonotic-data.pk3dir.git Revert "Filter out Overkill weapons from weapon impulse alias creation" This reverts commit df5e7bc623e36277ef1731a4f2be0b9dd2d495cc. --- diff --git a/qcsrc/common/weapons/all.qh b/qcsrc/common/weapons/all.qh index 2b6d4128d1..85b95243f2 100644 --- a/qcsrc/common/weapons/all.qh +++ b/qcsrc/common/weapons/all.qh @@ -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)