games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-09-16 09:26:28 +02:00
Code Issues Releases Activity

Merge with vcmi/develop branch

Browse Source
This commit is contained in:
Ivan Savenko
2022-12-30 00:52:23 +02:00
parent b8b1e07621 486c9612b8
commit 5d80457eda
136 changed files with 739 additions and 456 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
client/Client.cpp
View File

@@ -501,7 +501,7 @@ void CClient::installNewPlayerInterface(std::shared_ptr<CGameInterface> gameInte
logGlobal->trace("\tInitializing the interface for player %s", color.getStr());
auto cb = std::make_shared<CCallback>(gs, color, this);
battleCallbacks[color] = cb;
gameInterface->init(playerEnvironments.at(color), cb);
gameInterface->initGameInterface(playerEnvironments.at(color), cb);
installNewBattleInterface(gameInterface, color, battlecb);
}
@@ -517,7 +517,7 @@ void CClient::installNewBattleInterface(std::shared_ptr<CBattleGameInterface> ba
logGlobal->trace("\tInitializing the battle interface for player %s", color.getStr());
auto cbc = std::make_shared<CBattleCallback>(color, this);
battleCallbacks[color] = cbc;
battleInterface->init(playerEnvironments.at(color), cbc);
battleInterface->initBattleInterface(playerEnvironments.at(color), cbc);
}
}
@@ -755,7 +755,7 @@ scripting::Pool * CClient::getContextPool() const
void CClient::reinitScripting()
{
clientEventBus = make_unique<events::EventBus>();
clientEventBus = std::make_unique<events::EventBus>();
#if SCRIPTING_ENABLED
clientScripts.reset(new scripting::PoolImpl(this));
#endif