games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-23 00:28:08 +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

24
client/CPlayerInterface.cpp
View File

@ -12,6 +12,7 @@
#include <vcmi/Artifact.h>
#include "Client.h"
#include "CServerHandler.h"
#include "HeroMovementController.h"
#include "PlayerLocalState.h"
@ -668,7 +669,7 @@ void CPlayerInterface::battleStart(const BattleID & battleID, const CCreatureSet
autofightingAI->initBattleInterface(env, cb, autocombatPreferences);
autofightingAI->battleStart(battleID, army1, army2, tile, hero1, hero2, side, false);
isAutoFightOn = true;
cb->registerBattleInterface(autofightingAI);
registerBattleInterface(autofightingAI);
}
waitForAllDialogs();
@ -805,9 +806,7 @@ void CPlayerInterface::activeStack(const BattleID & battleID, const CStack * sta
autofightingAI->activeStack(battleID, stack);
return;
}
cb->unregisterBattleInterface(autofightingAI);
autofightingAI.reset();
unregisterBattleInterface(autofightingAI);
}
assert(battleInt);
@ -826,8 +825,7 @@ void CPlayerInterface::battleEnd(const BattleID & battleID, const BattleResult *
if(isAutoFightOn || autofightingAI)
{
isAutoFightOn = false;
cb->unregisterBattleInterface(autofightingAI);
autofightingAI.reset();
unregisterBattleInterface(autofightingAI);
if(!battleInt)
{
@ -1831,3 +1829,17 @@ std::optional<BattleAction> CPlayerInterface::makeSurrenderRetreatDecision(const
{
return std::nullopt;
}
void CPlayerInterface::registerBattleInterface(std::shared_ptr<CBattleGameInterface> battleEvents)
{
autofightingAI = battleEvents;
GAME->server().client->registerBattleInterface(battleEvents, playerID);
}
void CPlayerInterface::unregisterBattleInterface(std::shared_ptr<CBattleGameInterface> battleEvents)
{
assert(battleEvents == autofightingAI);
GAME->server().client->unregisterBattleInterface(autofightingAI, playerID);
autofightingAI.reset();
}