games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-12-03 23:19:22 +02:00
Code Issues Releases Activity

Merge pull request #2005 from IvanSavenko/advmap_refactor

Browse Source 
Refactoring of adventure map interface
This commit is contained in:
Ivan Savenko
2023-04-24 17:19:22 +03:00
committed by GitHub
parent f39f208e05 80b37a3019
commit 48abf46824
44 changed files with 1158 additions and 1135 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/NetPacksLib.cpp
View File

@@ -915,7 +915,7 @@ void FoWChange::applyGs(CGameState *gs)
(*fogOfWarMap)[t.z][t.x][t.y] = mode;
if (mode == 0) //do not hide too much
{
std::unordered_set<int3, ShashInt3> tilesRevealed;
std::unordered_set<int3> tilesRevealed;
for (auto & elem : gs->map->objects)
{
const CGObjectInstance *o = elem;
@@ -1918,7 +1918,7 @@ void AssembledArtifact::applyGs(CGameState *gs)
[[maybe_unused]] const CArtifactInstance *transformedArt = al.getArt();
assert(transformedArt);
bool combineEquipped = !ArtifactUtils::isSlotBackpack(al.slot);
assert(vstd::contains_if(transformedArt->assemblyPossibilities(artSet, combineEquipped), [=](const CArtifact * art)->bool
assert(vstd::contains_if(ArtifactUtils::assemblyPossibilities(artSet, transformedArt->artType->getId(), combineEquipped), [=](const CArtifact * art)->bool
{
return art->getId() == builtArt->getId();
}));