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

Nullkiller: fix build and some warnings

Browse Source
This commit is contained in:
Andrii Danylchenko 2021-05-15 22:04:31 +03:00 committed by Andrii Danylchenko
parent ada76a5603
commit fdd5be1e40
4 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
AI/Nullkiller/Engine/DangerHitMapAnalyzer.h
View File

@ -10,7 +10,7 @@
#pragma once #pragma once
#include "../VCAI.h" #include "../VCAI.h"
#include "../AIHelper.h" #include "../AIhelper.h"
struct HitMapInfo struct HitMapInfo
{ {

2
AI/Nullkiller/HeroManager.cpp
View File

@ -195,7 +195,7 @@ void ExistingSkillRule::evaluateScore(const CGHeroInstance * hero, SecondarySkil
upgradesLeft += SecSkillLevel::EXPERT - heroSkill.second; upgradesLeft += SecSkillLevel::EXPERT - heroSkill.second;
} }
if(score >= 2 || score >= 1 && upgradesLeft <= 1) if(score >= 2 || (score >= 1 && upgradesLeft <= 1))
score += 1.5; score += 1.5;
} }

16
AI/Nullkiller/Pathfinding/AINodeStorage.cpp
View File

@ -263,9 +263,6 @@ bool AINodeStorage::calculateHeroChain()
for(AIPathNode & node : chains) for(AIPathNode & node : chains)
{ {
if(node.coord.x == 60 && node.coord.y == 56 && node.actor)
logAi->trace(node.actor->toString());
if(node.turns <= heroChainTurn && node.action != CGPathNode::ENodeAction::UNKNOWN) if(node.turns <= heroChainTurn && node.action != CGPathNode::ENodeAction::UNKNOWN)
existingChains.push_back(&node); existingChains.push_back(&node);
} }
@ -304,8 +301,10 @@ void AINodeStorage::calculateHeroChain(
{ {
for(AIPathNode * node : variants) for(AIPathNode * node : variants)
{ {
if(node == srcNode || !node->actor || node->turns > heroChainTurn if(node == srcNode
|| node->action == CGPathNode::ENodeAction::UNKNOWN && node->actor->hero || !node->actor
|| node->turns > heroChainTurn
|| (node->action == CGPathNode::ENodeAction::UNKNOWN && node->actor->hero)
|| (node->actor->chainMask & srcNode->actor->chainMask) != 0) || (node->actor->chainMask & srcNode->actor->chainMask) != 0)
{ {
continue; continue;
@ -331,7 +330,7 @@ void AINodeStorage::calculateHeroChain(
std::vector<ExchangeCandidate> & result) const std::vector<ExchangeCandidate> & result) const
{ {
if(carrier->armyLoss < carrier->actor->armyValue if(carrier->armyLoss < carrier->actor->armyValue
&& (carrier->action != CGPathNode::BATTLE || carrier->actor->allowBattle && carrier->specialAction) && (carrier->action != CGPathNode::BATTLE || (carrier->actor->allowBattle && carrier->specialAction))
&& other->armyLoss < other->actor->armyValue && other->armyLoss < other->actor->armyValue
&& carrier->actor->canExchange(other->actor)) && carrier->actor->canExchange(other->actor))
{ {
@ -429,10 +428,7 @@ ExchangeCandidate AINodeStorage::calculateExchange(
AIPathNode * otherParentNode) const AIPathNode * otherParentNode) const
{ {
ExchangeCandidate candidate; ExchangeCandidate candidate;
auto carrierActor = carrierParentNode->actor;
auto otherActor = otherParentNode->actor;
candidate.layer = carrierParentNode->layer; candidate.layer = carrierParentNode->layer;
candidate.coord = carrierParentNode->coord; candidate.coord = carrierParentNode->coord;
candidate.carrierParent = carrierParentNode; candidate.carrierParent = carrierParentNode;

2
AI/Nullkiller/Pathfinding/PathfindingManager.cpp
View File

@ -136,7 +136,7 @@ Goals::TGoalVec PathfindingManager::findPaths(
for(auto path : chainInfo) for(auto path : chainInfo)
{ {
if(hero && hero.get() != path.targetHero || path.nodes.empty()) if((hero && hero.get() != path.targetHero) || path.nodes.empty())
continue; continue;
const AIPathNodeInfo & firstNode = path.firstNode(); const AIPathNodeInfo & firstNode = path.firstNode();