diff options
| author | Tim Angus <tim@ngus.net> | 2003-03-22 02:25:18 +0000 |
|---|---|---|
| committer | Tim Angus <tim@ngus.net> | 2003-03-22 02:25:18 +0000 |
| commit | 62a23c3088d9766003a2df61c374b8e7af5a7fdb (patch) | |
| tree | 958e4884a28a9595dc9d17e880dcbe762258ea20 /src/ui | |
| parent | b75d0e2a7e2d29e8575dea17c2c45fc8f3dd5b50 (diff) | |
* Code support for the new armoury menu
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/ui_main.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/ui/ui_main.c b/src/ui/ui_main.c index a48b78bc..2bfe2b18 100644 --- a/src/ui/ui_main.c +++ b/src/ui/ui_main.c @@ -3415,7 +3415,8 @@ static void UI_LoadTremHumanArmouryBuys( ) if( BG_FindTeamForWeapon( i ) == WUT_HUMANS && BG_FindPurchasableForWeapon( i ) && BG_FindStagesForWeapon( i, stage ) && - !( BG_FindSlotsForWeapon( i ) & slots ) ) + !( BG_FindSlotsForWeapon( i ) & slots ) && + !( weapons & ( 1 << i ) ) ) { uiInfo.tremHumanArmouryBuyList[ j ].text = String_Alloc( BG_FindHumanNameForWeapon( i ) ); @@ -3434,7 +3435,8 @@ static void UI_LoadTremHumanArmouryBuys( ) { if( BG_FindTeamForUpgrade( i ) == WUT_HUMANS && BG_FindStagesForUpgrade( i, stage ) && - !( BG_FindSlotsForUpgrade( i ) & slots ) ) + !( BG_FindSlotsForUpgrade( i ) & slots ) && + !( upgrades & ( 1 << i ) ) ) { uiInfo.tremHumanArmouryBuyList[ j ].text = String_Alloc( BG_FindHumanNameForUpgrade( i ) ); |