Skip to content

Commit 1bad682

Browse files
committed
Merge pull request OpenXcom#875 from ajschult/sellDisplay
Don't alter the "Days/Hours Left" display when selling items
2 parents ffebe37 + b9b6c98 commit 1bad682

1 file changed

Lines changed: 6 additions & 5 deletions

File tree

src/Basescape/ManufactureState.cpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -201,12 +201,13 @@ void ManufactureState::fillProductionList()
201201
std::wostringstream s3;
202202
s3 << Text::formatFunding((*iter)->getRules()->getManufactureCost());
203203
std::wostringstream s4;
204-
if ((*iter)->getAssignedEngineers() > 0)
204+
if ((*iter)->getInfiniteAmount())
205205
{
206-
int timeLeft;
207-
if ((*iter)->getSellItems())
208-
timeLeft = ((*iter)->getAmountProduced()+1) * (*iter)->getRules()->getManufactureTime() - (*iter)->getTimeSpent();
209-
else timeLeft = (*iter)->getAmountTotal() * (*iter)->getRules()->getManufactureTime() - (*iter)->getTimeSpent();
206+
s4 << Language::utf8ToWstr("");
207+
}
208+
else if ((*iter)->getAssignedEngineers() > 0)
209+
{
210+
int timeLeft = (*iter)->getAmountTotal() * (*iter)->getRules()->getManufactureTime() - (*iter)->getTimeSpent();
210211
timeLeft /= (*iter)->getAssignedEngineers();
211212
float dayLeft = timeLeft / 24.0f;
212213
int hours = (dayLeft - static_cast<int>(dayLeft)) * 24;

0 commit comments

Comments
 (0)