Skip to content

Commit 76a811e

Browse files
committed
in fact remove that vector altogether
1 parent 27b27b6 commit 76a811e

2 files changed

Lines changed: 5 additions & 10 deletions

File tree

src/Basescape/TransferItemsState.cpp

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ namespace OpenXcom
5555
* @param baseFrom Pointer to the source base.
5656
* @param baseTo Pointer to the destination base.
5757
*/
58-
TransferItemsState::TransferItemsState(Game *game, Base *baseFrom, Base *baseTo) : State(game), _baseFrom(baseFrom), _baseTo(baseTo), _baseQty(), _transferQty(), _destQty(), _soldiers(), _crafts(), _items(), _sel(0), _total(0), _pQty(0), _cQty(0), _aQty(0), _iQty(0.0f), _hasSci(0), _hasEng(0), _distance(0.0)
58+
TransferItemsState::TransferItemsState(Game *game, Base *baseFrom, Base *baseTo) : State(game), _baseFrom(baseFrom), _baseTo(baseTo), _baseQty(), _transferQty(), _soldiers(), _crafts(), _items(), _sel(0), _total(0), _pQty(0), _cQty(0), _aQty(0), _iQty(0.0f), _hasSci(0), _hasEng(0), _distance(0.0)
5959
{
6060
_changeValueByMouseWheel = Options::getInt("changeValueByMouseWheel");
6161
_allowChangeListValuesByMouseWheel = (Options::getBool("allowChangeListValuesByMouseWheel") && _changeValueByMouseWheel);
@@ -143,7 +143,6 @@ TransferItemsState::TransferItemsState(Game *game, Base *baseFrom, Base *baseTo)
143143
{
144144
_baseQty.push_back(1);
145145
_transferQty.push_back(0);
146-
_destQty.push_back(0);
147146
_soldiers.push_back(*i);
148147
_lstItems->addRow(4, (*i)->getName().c_str(), L"1", L"0", L"0");
149148
}
@@ -154,7 +153,6 @@ TransferItemsState::TransferItemsState(Game *game, Base *baseFrom, Base *baseTo)
154153
{
155154
_baseQty.push_back(1);
156155
_transferQty.push_back(0);
157-
_destQty.push_back(0);
158156
_crafts.push_back(*i);
159157
_lstItems->addRow(4, (*i)->getName(_game->getLanguage()).c_str(), L"1", L"0", L"0");
160158
}
@@ -163,22 +161,20 @@ TransferItemsState::TransferItemsState(Game *game, Base *baseFrom, Base *baseTo)
163161
{
164162
_baseQty.push_back(_baseFrom->getAvailableScientists());
165163
_transferQty.push_back(0);
166-
_destQty.push_back(_baseTo->getAvailableScientists());
167164
_hasSci = 1;
168165
std::wstringstream ss, ss2;
169166
ss << _baseQty.back();
170-
ss2 << _destQty.back();
167+
ss2 << _baseTo->getAvailableScientists();
171168
_lstItems->addRow(4, tr("STR_SCIENTIST").c_str(), ss.str().c_str(), L"0", ss2.str().c_str());
172169
}
173170
if (_baseFrom->getAvailableEngineers() > 0)
174171
{
175172
_baseQty.push_back(_baseFrom->getAvailableEngineers());
176173
_transferQty.push_back(0);
177-
_destQty.push_back(_baseTo->getAvailableEngineers());
178174
_hasEng = 1;
179175
std::wstringstream ss, ss2;
180176
ss << _baseQty.back();
181-
ss2 << _destQty.back();
177+
ss2 << _baseTo->getAvailableEngineers();
182178
_lstItems->addRow(4, tr("STR_ENGINEER").c_str(), ss.str().c_str(), L"0", ss2.str().c_str());
183179
}
184180
const std::vector<std::string> &items = _game->getRuleset()->getItemsList();
@@ -189,11 +185,10 @@ TransferItemsState::TransferItemsState(Game *game, Base *baseFrom, Base *baseTo)
189185
{
190186
_baseQty.push_back(qty);
191187
_transferQty.push_back(0);
192-
_destQty.push_back(_baseTo->getItems()->getItem(*i));
193188
_items.push_back(*i);
194189
std::wstringstream ss, ss2;
195190
ss << qty;
196-
ss2 << _destQty.back();
191+
ss2 << _baseTo->getItems()->getItem(*i);
197192
_lstItems->addRow(4, tr(*i).c_str(), ss.str().c_str(), L"0", ss2.str().c_str());
198193
}
199194
}

src/Basescape/TransferItemsState.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ class TransferItemsState : public State
4848
Window *_window;
4949
Text *_txtTitle, *_txtItem, *_txtQuantity, *_txtAmountTransfer, *_txtAmountDestination;
5050
TextList *_lstItems;
51-
std::vector<int> _baseQty, _transferQty, _destQty;
51+
std::vector<int> _baseQty, _transferQty;
5252
std::vector<Soldier*> _soldiers;
5353
std::vector<Craft*> _crafts;
5454
std::vector<std::string> _items;

0 commit comments

Comments
 (0)