Skip to content

Commit

Permalink
Always show droids in production, even if obsolete.
Browse files Browse the repository at this point in the history
This allows cancelling production of obsolete droids, without cancelling all production in the factory.
  • Loading branch information
Cyp committed Feb 6, 2012
1 parent ae59186 commit 24d0d1b
Showing 1 changed file with 5 additions and 5 deletions.
10 changes: 5 additions & 5 deletions src/template.cpp
Expand Up @@ -679,7 +679,7 @@ void fillTemplateList(std::vector<DROID_TEMPLATE *> &pList, STRUCTURE *psFactory
for (std::list<DROID_TEMPLATE>::iterator i = localTemplates.begin(); i != localTemplates.end(); ++i)
{
psCurr = &*i;
//must add Command Droid if currently in production
// Must add droids if currently in production.
if (!getProduction(psFactory, psCurr).quantity)
{
//can only have (MAX_CMDDROIDS) in the world at any one time
Expand All @@ -690,11 +690,11 @@ void fillTemplateList(std::vector<DROID_TEMPLATE *> &pList, STRUCTURE *psFactory
continue;
}
}
}

if (!psCurr->enabled || !validTemplateForFactory(psCurr, psFactory) || !researchedTemplate(psCurr, player))
{
continue;
if (!psCurr->enabled || !validTemplateForFactory(psCurr, psFactory) || !researchedTemplate(psCurr, player))
{
continue;
}
}

//check the factory can cope with this sized body
Expand Down

0 comments on commit 24d0d1b

Please sign in to comment.