Skip to content

Commit bfb162e

Browse files
committed
allow quick armourselection in quickbattle
1 parent df70ca1 commit bfb162e

1 file changed

Lines changed: 7 additions & 3 deletions

File tree

‎src/Basescape/CraftArmorState.cpp‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -170,11 +170,11 @@ void CraftArmorState::lstSoldiersClick(Action *action)
170170
}
171171
else
172172
{
173+
SavedGame *_save;
174+
_save = _game->getSavedGame();
175+
Armor *a = _game->getRuleset()->getArmor(_save->getLastSelectedArmor());
173176
if (_game->getSavedGame()->getMonthsPassed() != -1)
174177
{
175-
SavedGame *_save;
176-
_save = _game->getSavedGame();
177-
Armor *a = _game->getRuleset()->getArmor(_save->getLastSelectedArmor());
178178
if (_base->getItems()->getItem(a->getStoreItem()) > 0 || a->getStoreItem() == "STR_NONE")
179179
{
180180
if (s->getArmor()->getStoreItem() != "STR_NONE")
@@ -189,6 +189,10 @@ void CraftArmorState::lstSoldiersClick(Action *action)
189189
s->setArmor(a);
190190
_lstSoldiers->setCellText(_lstSoldiers->getSelectedRow(), 2, tr(a->getType()));
191191
}
192+
}else
193+
{
194+
s->setArmor(a);
195+
_lstSoldiers->setCellText(_lstSoldiers->getSelectedRow(), 2, tr(a->getType()));
192196
}
193197
}
194198
}

0 commit comments

Comments
 (0)