mirror of
https://github.com/vcmi/vcmi.git
synced 2025-09-16 09:26:28 +02:00
Fixes crashes caused by CREATURE_TERRAIN_LIMITER
This commit is contained in:
@@ -52,9 +52,9 @@ int EditorCallback::getDate(Date mode) const
|
||||
THROW_EDITOR_UNSUPPORTED;
|
||||
}
|
||||
|
||||
const TerrainTile * EditorCallback::getTile(int3, bool) const
|
||||
const TerrainTile * EditorCallback::getTile(int3 tile, bool) const
|
||||
{
|
||||
THROW_EDITOR_UNSUPPORTED;
|
||||
return &map->getTile(tile);
|
||||
}
|
||||
|
||||
const TerrainTile * EditorCallback::getTileUnchecked(int3) const
|
||||
|
@@ -607,6 +607,7 @@ void CGameState::initHeroes(IGameRandomizer & gameRandomizer)
|
||||
continue;
|
||||
}
|
||||
hero->initHero(gameRandomizer);
|
||||
hero->armyChanged();
|
||||
}
|
||||
|
||||
// generate boats for all heroes on water
|
||||
|
@@ -661,7 +661,9 @@ void CCreatureSet::serializeJson(JsonSerializeFormat & handler, const std::strin
|
||||
{
|
||||
auto newStack = std::make_unique<CStackInstance>(getArmy()->cb);
|
||||
newStack->serializeJson(handler);
|
||||
putStack(SlotID(static_cast<si32>(idx)), std::move(newStack));
|
||||
SlotID slot(static_cast<si32>(idx));
|
||||
stacks[slot] = std::move(newStack);
|
||||
stacks[slot]->setArmy(getArmy());
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user