File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 2929#include " ../Interface/TextList.h"
3030#include " ../Ruleset/Ruleset.h"
3131#include " ../Ruleset/Armor.h"
32+ #include " ../Savegame/SavedGame.h"
3233#include " ../Savegame/Soldier.h"
3334#include " ../Savegame/Base.h"
3435#include " ../Savegame/ItemContainer.h"
@@ -141,13 +142,16 @@ void SoldierArmorState::btnCancelClick(Action *)
141142void SoldierArmorState::lstArmorClick (Action *)
142143{
143144 Soldier *soldier = _base->getSoldiers ()->at (_soldier);
144- if (soldier-> getArmor ()->getStoreItem () != " STR_NONE " )
145+ if (_game-> getSavedGame ()->getMonthsPassed () != - 1 )
145146 {
146- _base->getItems ()->addItem (soldier->getArmor ()->getStoreItem ());
147- }
148- if (_armors[_lstArmor->getSelectedRow ()]->getStoreItem () != " STR_NONE" )
149- {
150- _base->getItems ()->removeItem (_armors[_lstArmor->getSelectedRow ()]->getStoreItem ());
147+ if (soldier->getArmor ()->getStoreItem () != " STR_NONE" )
148+ {
149+ _base->getItems ()->addItem (soldier->getArmor ()->getStoreItem ());
150+ }
151+ if (_armors[_lstArmor->getSelectedRow ()]->getStoreItem () != " STR_NONE" )
152+ {
153+ _base->getItems ()->removeItem (_armors[_lstArmor->getSelectedRow ()]->getStoreItem ());
154+ }
151155 }
152156 soldier->setArmor (_armors[_lstArmor->getSelectedRow ()]);
153157
You can’t perform that action at this time.
0 commit comments