games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-25 22:42:04 +02:00
Code Issues Releases Activity

Removed remaining usages of std::vector<bool>

Browse Source
This commit is contained in:
Ivan Savenko
2023-11-05 15:24:26 +02:00
parent a9f868b379
commit 0842f5afee
54 changed files with 140 additions and 317 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
lib/CHeroHandler.cpp
View File

@@ -393,11 +393,6 @@ void CHeroClassHandler::afterLoadFinalization()
}
}
std::vector<bool> CHeroClassHandler::getDefaultAllowed() const
{
return std::vector<bool>(size(), true);
}
CHeroClassHandler::~CHeroClassHandler() = default;
CHeroHandler::~CHeroHandler() = default;
@@ -763,18 +758,15 @@ ui64 CHeroHandler::reqExp (ui32 level) const
}
}
std::vector<bool> CHeroHandler::getDefaultAllowed() const
std::set<HeroTypeID> CHeroHandler::getDefaultAllowed() const
{
// Look Data/HOTRAITS.txt for reference
std::vector<bool> allowedHeroes;
allowedHeroes.reserve(size());
std::set<HeroTypeID> result;
for(const CHero * hero : objects)
{
allowedHeroes.push_back(hero && !hero->special);
}
if (hero && !hero->special)
result.insert(hero->getId());
return allowedHeroes;
return result;
}
VCMI_LIB_NAMESPACE_END