Techwizz/Gobligine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix a potential bug when requesting supplies for queued AI things caused by re-arranging the queue

Browse source
This commit is contained in:
Tim Felgentreff 2015-12-13 23:20:07 +01:00
parent 6034ff515d
commit 558ad55bb0
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/ai/ai_resource.cpp
View file

@ -862,6 +862,7 @@ static void AiCheckingWork()
for (int i = 0; i < sz; ++i) { for (int i = 0; i < sz; ++i) {
AiBuildQueue &queue = AiPlayer->UnitTypeBuilt[AiPlayer->UnitTypeBuilt.size() - sz + i]; AiBuildQueue &queue = AiPlayer->UnitTypeBuilt[AiPlayer->UnitTypeBuilt.size() - sz + i];
CUnitType &type = *queue.Type; CUnitType &type = *queue.Type;
bool new_supply = false;
// FIXME: must check if requirements are fulfilled. // FIXME: must check if requirements are fulfilled.
// Buildings can be destroyed. // Buildings can be destroyed.
@ -869,7 +870,7 @@ static void AiCheckingWork()
// Check if we have enough food. // Check if we have enough food.
if (type.Stats[AiPlayer->Player->Index].Variables[DEMAND_INDEX].Value && !AiCheckSupply(*AiPlayer, type)) { if (type.Stats[AiPlayer->Player->Index].Variables[DEMAND_INDEX].Value && !AiCheckSupply(*AiPlayer, type)) {
AiPlayer->NeedSupply = true; AiPlayer->NeedSupply = true;
AiRequestSupply(); new_supply = true;
} }
// Check limits, AI should be broken if reached. // Check limits, AI should be broken if reached.
if (queue.Want > queue.Made && AiPlayer->Player->CheckLimits(type) < 0) { if (queue.Want > queue.Made && AiPlayer->Player->CheckLimits(type) < 0) {
@ -897,6 +898,10 @@ static void AiCheckingWork()
} }
} }
} }
if (new_supply) {
// trigger this last, because it may re-arrange the queue and invalidate our queue item
AiRequestSupply();
}
} }
} }