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

Fix crashes on game start, gamestate now derives from GameCallbackHolder

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-01 15:59:08 +03:00
parent d34b47bb20
commit d1d2cf4189
21 changed files with 99 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
test/game/CGameStateTest.cpp
View File

@ -48,9 +48,9 @@ public:
void SetUp() override
{
gameState = std::make_shared<CGameState>();
gameState = std::make_shared<CGameState>(gameCallback.get());
gameCallback->setGameState(gameState);
gameState->preInit(&services, gameCallback.get());
gameState->preInit(&services);
}
void TearDown() override
@ -196,11 +196,11 @@ public:
auto terrain = t.getTerrainID();
BattleField terType(0);
BattleLayout layout = BattleLayout::createDefaultLayout(gameState->callback, attacker, defender);
BattleLayout layout = BattleLayout::createDefaultLayout(gameState->cb, attacker, defender);
//send info about battles
auto battle = BattleInfo::setupBattle(gameState->callback, tile, terrain, terType, armedInstancies, heroes, layout, nullptr);
auto battle = BattleInfo::setupBattle(gameState->cb, tile, terrain, terType, armedInstancies, heroes, layout, nullptr);
BattleStart bs;
bs.info = std::move(battle);