Skip to content

Commit d736c37

Browse files
committed
Merge pull request OpenXcom#905 from myk002/clarify_template_icons
Clarify template icons
2 parents 5138da5 + 87b596d commit d736c37

5 files changed

Lines changed: 4 additions & 2 deletions

File tree

bin/data/Resources/UI/invcopy.png

26 Bytes
Loading
32 Bytes
Loading

bin/data/Resources/UI/invpaste.png

23 Bytes
Loading
32 Bytes
Loading

src/Battlescape/InventoryState.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -620,8 +620,10 @@ static void _clearInventory(Game *game, std::vector<BattleItem*> *unitInv, Tile
620620

621621
void InventoryState::btnApplyTemplateClick(Action *action)
622622
{
623-
// don't accept clicks when moving items or when the template is empty
624-
if (_inv->getSelectedItem() != 0 || _curInventoryTemplate.empty())
623+
// don't accept clicks when moving items
624+
// it's ok if the template is empty -- it will just result in clearing the
625+
// unit's inventory
626+
if (_inv->getSelectedItem() != 0)
625627
{
626628
return;
627629
}

0 commit comments

Comments
 (0)