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

Reduce usage of implicit conversions to int

Browse Source
This commit is contained in:
Ivan Savenko
2025-04-19 16:12:07 +03:00
parent 4d57a8ed36
commit 829739da24
64 changed files with 220 additions and 200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
server/CVCMIServer.cpp
View File

@@ -953,10 +953,10 @@ bool CVCMIServer::canUseThisHero(PlayerColor player, HeroTypeID ID)
if (!ID.hasValue())
return false;
if (ID >= LIBRARY->heroh->size())
if (ID.getNum() >= LIBRARY->heroh->size())
return false;
if (si->playerInfos[player].castle != LIBRARY->heroh->objects[ID]->heroClass->faction)
if (si->playerInfos[player].castle != ID.toHeroType()->heroClass->faction)
return false;
if (vstd::contains(getUsedHeroes(), ID))
@@ -979,7 +979,7 @@ std::vector<HeroTypeID> CVCMIServer::getUsedHeroes()
{
const auto & heroes = getPlayerInfo(p.first).heroesNames;
for(auto & hero : heroes)
if(hero.heroId >= 0) //in VCMI map format heroId = -1 means random hero
if(hero.heroId.hasValue())
heroIds.push_back(hero.heroId);
if(p.second.hero != HeroTypeID::RANDOM)