games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2025-06-15 00:05:02 +02:00
Code Issues Releases Activity

Fixed lots of warnings.

Browse Source 
Disabled the following (for MSVC only) that couldn't (or shouldn't) be fixed.

4003: not enough actual parameters for macro 'identifier'
4250: 'class1' : inherits 'class2::member' via dominance
4251: 'type' : class 'type1' needs to have dll-interface to be used by clients of class 'type2'
4275: non dll-interface class 'type1' used as base for dll-interface class 'type2'
This commit is contained in:
John Bolton
2020-10-01 01:38:06 -07:00
parent ff471af3de
commit a05ae78e67
142 changed files with 854 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
lib/mapObjects/CRewardableObject.cpp
View File

@ -44,7 +44,7 @@ bool CRewardLimiter::heroAllowed(const CGHeroInstance * hero) const
if(!IObjectInterface::cb->getPlayer(hero->tempOwner)->resources.canAfford(resources))
return false;
if(minLevel > hero->level)
if(minLevel > (si32)hero->level)
return false;
for(size_t i=0; i<primary.size(); i++)
@ -80,7 +80,7 @@ std::vector<ui32> CRewardableObject::getAvailableRewards(const CGHeroInstance *
&& visit.limiter.heroAllowed(hero))
{
logGlobal->trace("Reward %d is allowed", i);
ret.push_back(i);
ret.push_back(static_cast<ui32>(i));
}
}
return ret;
@ -161,7 +161,7 @@ void CRewardableObject::onHeroVisit(const CGHeroInstance *h) const
grantRewardWithMessage(rewards[0]);
break;
case SELECT_RANDOM: // select one randomly //TODO: use weights
grantRewardWithMessage(rewards[CRandomGenerator::getDefault().nextInt(rewards.size()-1)]);
grantRewardWithMessage(rewards[CRandomGenerator::getDefault().nextInt((int)rewards.size()-1)]);
break;
}
break;
@ -360,7 +360,7 @@ void CRewardInfo::loadComponents(std::vector<Component> & comps,
if (gainedExp)
{
comps.push_back(Component(
Component::EXPERIENCE, 0, h->calculateXp(gainedExp), 0));
Component::EXPERIENCE, 0, (si32)h->calculateXp(gainedExp), 0));
}
if (gainedLevels) comps.push_back(Component(Component::EXPERIENCE, 0, gainedLevels, 0));
@ -369,7 +369,7 @@ void CRewardInfo::loadComponents(std::vector<Component> & comps,
for (size_t i=0; i<primary.size(); i++)
{
if (primary[i] != 0)
comps.push_back(Component(Component::PRIM_SKILL, i, primary[i], 0));
comps.push_back(Component(Component::PRIM_SKILL, (ui16)i, primary[i], 0));
}
for (auto & entry : secondary)
@ -387,7 +387,7 @@ void CRewardInfo::loadComponents(std::vector<Component> & comps,
for (size_t i=0; i<resources.size(); i++)
{
if (resources[i] !=0)
comps.push_back(Component(Component::RESOURCE, i, resources[i], 0));
comps.push_back(Component(Component::RESOURCE, (ui16)i, resources[i], 0));
}
}
@ -1153,7 +1153,7 @@ std::vector<ui32> CGMagicSpring::getAvailableRewards(const CGHeroInstance * hero
{
if (pos - tiles[i] == hero->getPosition() && info[i].numOfGrants == 0)
{
return std::vector<ui32>(1, i);
return std::vector<ui32>(1, (ui32)i);
}
}
// hero is either not on visitable tile (should not happen) or tile is already used