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

Rework CCallback <-> CClient interaction

Browse Source 
- callback is now part of lib instead of weird class that is shared by
client and AI while being part of client
- callback interacts with client class via minimal interface class
- removed no longer used unlockGsWhileWaiting field
This commit is contained in:
Ivan Savenko
2025-05-11 17:50:50 +03:00
parent 35644da2b7
commit 2c17c2d5b7
21 changed files with 126 additions and 123 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
client/battle/BattleWindow.cpp
View File

@@ -707,8 +707,7 @@ void BattleWindow::bAutofightf()
ai->initBattleInterface(owner.curInt->env, owner.curInt->cb, autocombatPreferences);
ai->battleStart(owner.getBattleID(), owner.army1, owner.army2, int3(0,0,0), owner.attackingHeroInstance, owner.defendingHeroInstance, owner.getBattle()->battleGetMySide(), false);
owner.curInt->autofightingAI = ai;
owner.curInt->cb->registerBattleInterface(ai);
owner.curInt->registerBattleInterface(ai);
owner.requestAutofightingAIToTakeAction();
}
@@ -910,9 +909,7 @@ void BattleWindow::endWithAutocombat()
ai->battleStart(owner.getBattleID(), owner.army1, owner.army2, int3(0,0,0), owner.attackingHeroInstance, owner.defendingHeroInstance, owner.getBattle()->battleGetMySide(), false);
owner.curInt->isAutoFightOn = true;
owner.curInt->cb->registerBattleInterface(ai);
owner.curInt->autofightingAI = ai;
owner.curInt->registerBattleInterface(ai);
owner.requestAutofightingAIToTakeAction();
close();