games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-23 22:37:55 +02:00
Code Issues Releases Activity

found a bug in code where AI can change client gamestate directly causing sorting crash

Browse Source
This commit is contained in:
Andrii Danylchenko
2021-01-30 14:13:45 +02:00
parent 5dc6d782f7
commit ade84699b0
4 changed files with 17 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
AI/BattleAI/BattleAI.cpp
View File

@@ -578,6 +578,7 @@ void CBattleAI::attemptCastingSpell()
size_t minTurnSpan = ourUnits/3; //todo: tweak this
std::vector<battle::Units> newTurnOrder;
state.battleGetTurnOrder(newTurnOrder, amount, 2);
const bool turnSpanOK = evaluateQueue(newValueOfStack, newTurnOrder, &state, minTurnSpan, nullptr);

9
AI/BattleAI/StackWithBonuses.cpp
View File

@@ -14,11 +14,16 @@
void actualizeEffect(TBonusListPtr target, const Bonus & ef)
{
for(auto bonus : *target) //TODO: optimize
for(auto & bonus : *target) //TODO: optimize
{
if(bonus->source == Bonus::SPELL_EFFECT && bonus->type == ef.type && bonus->subtype == ef.subtype)
{
bonus->turnsRemain = std::max(bonus->turnsRemain, ef.turnsRemain);
if(bonus->turnsRemain < ef.turnsRemain)
{
bonus.reset(new Bonus(*bonus));
bonus->turnsRemain = ef.turnsRemain;
}
}
}
}