From 81b4f782f7e2c2e462d214ca36ce8d1bbd041ccd Mon Sep 17 00:00:00 2001 From: Christoph Oelckers Date: Tue, 1 May 2012 10:30:08 +0000 Subject: [PATCH] - fixed: powered up weapons must not be added to the weapon slots. SVN r3612 (trunk) --- src/g_shared/a_weapons.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/g_shared/a_weapons.cpp b/src/g_shared/a_weapons.cpp index 2813932db..c85077102 100644 --- a/src/g_shared/a_weapons.cpp +++ b/src/g_shared/a_weapons.cpp @@ -1192,6 +1192,7 @@ void FWeaponSlots::AddExtraWeapons() (cls->ActorInfo->GameFilter == GAME_Any || (cls->ActorInfo->GameFilter & gameinfo.gametype)) && cls->ActorInfo->Replacement == NULL && // Replaced weapons don't get slotted. cls->IsDescendantOf(RUNTIME_CLASS(AWeapon)) && + !(static_cast(GetDefaultByType(cls))->WeaponFlags & WIF_POWERED_UP) && !LocateWeapon(cls, NULL, NULL) // Don't duplicate it if it's already present. ) {