浏览代码

Accessibility tweaks + fix some compile errors

Dydzio 7 年之前
父节点
当前提交
12d750a767
共有 2 个文件被更改,包括 7 次插入9 次删除
  1. 3 3
      AI/VCAI/AIUtility.cpp
  2. 4 6
      AI/VCAI/Fuzzy.h

+ 3 - 3
AI/VCAI/AIUtility.cpp

@@ -245,7 +245,7 @@ ui64 evaluateDanger(crint3 tile, const CGHeroInstance * visitor)
 			auto armedObj = dynamic_cast<const CArmedInstance *>(dangerousObject);
 			if(armedObj)
 			{
-				float tacticalAdvantage = fh->getTacticalAdvantage(visitor, armedObj);
+				float tacticalAdvantage = fh->tacticalAdvantageEngine.getTacticalAdvantage(visitor, armedObj);
 				objectDanger *= tacticalAdvantage; //this line tends to go infinite for allied towns (?)
 			}
 		}
@@ -258,7 +258,7 @@ ui64 evaluateDanger(crint3 tile, const CGHeroInstance * visitor)
 				auto guards = cb->getGuardingCreatures(it->second->visitablePos());
 				for(auto cre : guards)
 				{
-					vstd::amax(guardDanger, evaluateDanger(cre) * fh->getTacticalAdvantage(visitor, dynamic_cast<const CArmedInstance *>(cre)));
+					vstd::amax(guardDanger, evaluateDanger(cre) * fh->tacticalAdvantageEngine.getTacticalAdvantage(visitor, dynamic_cast<const CArmedInstance *>(cre)));
 				}
 			}
 		}
@@ -267,7 +267,7 @@ ui64 evaluateDanger(crint3 tile, const CGHeroInstance * visitor)
 	auto guards = cb->getGuardingCreatures(tile);
 	for(auto cre : guards)
 	{
-		vstd::amax(guardDanger, evaluateDanger(cre) * fh->getTacticalAdvantage(visitor, dynamic_cast<const CArmedInstance *>(cre))); //we are interested in strongest monster around
+		vstd::amax(guardDanger, evaluateDanger(cre) * fh->tacticalAdvantageEngine.getTacticalAdvantage(visitor, dynamic_cast<const CArmedInstance *>(cre))); //we are interested in strongest monster around
 	}
 
 	//TODO mozna odwiedzic blockvis nie ruszajac straznika

+ 4 - 6
AI/VCAI/Fuzzy.h

@@ -18,13 +18,13 @@ struct SectorMap;
 
 class engineBase
 {
-public:
+protected:
 	fl::Engine engine;
 	fl::RuleBlock rules;
-
-	engineBase();
 	virtual void configure();
 	void addRule(const std::string & txt);
+public:
+	engineBase();
 };
 
 class TacticalAdvantageEngine : public engineBase
@@ -85,13 +85,11 @@ class FuzzyHelper
 {
 	friend class VCAI;
 
+public:
 	TacticalAdvantageEngine tacticalAdvantageEngine;
-
 	VisitTileEngine visitTileEngine;
-
 	GetObjEngine getObjEngine;
 
-public:
 	float evaluate(Goals::Explore & g);
 	float evaluate(Goals::RecruitHero & g);
 	float evaluate(Goals::VisitTile & g);