1
0
mirror of https://github.com/vcmi/vcmi.git synced 2025-11-06 09:09:40 +02:00

Fixed lots of warnings.

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

View File

@@ -17,8 +17,6 @@
#include "../Goals/AbstractGoal.h"
#include "Actions/ISpecialAction.h"
struct AIPathNode;
struct AIPathNode : public CGPathNode
{
uint32_t chainMask;

View File

@@ -49,7 +49,7 @@ namespace AIPathfinding
source->manaCost);
#endif
return hero->mana >= source->manaCost + getManaCost(hero);
return hero->mana >= (si32)(source->manaCost + getManaCost(hero));
}
uint32_t SummonBoatAction::getManaCost(const CGHeroInstance * hero) const

View File

@@ -13,7 +13,7 @@
#include "../../AIUtility.h"
#include "../../Goals/AbstractGoal.h"
class AIPathNode;
struct AIPathNode;
class ISpecialAction
{

View File

@@ -178,7 +178,7 @@ Goals::TGoalVec PathfindingManager::findPath(
#ifdef VCMI_TRACE_PATHFINDER
logAi->trace("Gather army for %s, value=%s", hero->name, std::to_string(danger));
#endif
result.push_back(sptr(Goals::GatherArmy(danger * SAFE_ATTACK_CONSTANT).sethero(hero).setisAbstract(true)));
result.push_back(sptr(Goals::GatherArmy((int)(danger * SAFE_ATTACK_CONSTANT)).sethero(hero).setisAbstract(true)));
}
return result;

View File

@@ -116,7 +116,7 @@ namespace AIPathfinding
auto boatNodeOptional = nodeStorage->getOrCreateNode(
node->coord,
node->layer,
node->chainMask | virtualBoat->getSpecialChain());
(int)(node->chainMask | virtualBoat->getSpecialChain()));
if(boatNodeOptional)
{