Removed excessive pathfinder includes

2025-11-06 09:09:40 +02:00 · 2023-06-21 12:00:44 +03:00
parent 02ea798c97
commit 87fcfa4add
43 changed files with 10 additions and 38 deletions
--- a/AI/Nullkiller/AIUtility.h
+++ b/AI/Nullkiller/AIUtility.h
@@ -46,7 +46,6 @@
 #include "../../lib/spells/CSpellHandler.h"
 #include "../../lib/CStopWatch.h"
 #include "../../lib/mapObjects/CGHeroInstance.h"
-#include "../../lib/CPathfinder.h"
 #include "../../CCallback.h"

 #include <chrono>
--- a/AI/Nullkiller/Behaviors/BuildingBehavior.cpp
+++ b/AI/Nullkiller/Behaviors/BuildingBehavior.cpp
@@ -15,7 +15,6 @@
 #include "../Goals/Composition.h"
 #include "../Goals/BuildThis.h"
 #include "../Goals/SaveResources.h"
-#include "lib/CPathfinder.h"
 #include "../Engine/Nullkiller.h"

 namespace NKAI
--- a/AI/Nullkiller/Behaviors/BuyArmyBehavior.cpp
+++ b/AI/Nullkiller/Behaviors/BuyArmyBehavior.cpp
@@ -13,7 +13,6 @@
 #include "../AIUtility.h"
 #include "../Goals/BuyArmy.h"
 #include "../Engine/Nullkiller.h"
-#include "lib/CPathfinder.h"

 namespace NKAI
 {
--- a/AI/Nullkiller/Behaviors/DefenceBehavior.cpp
+++ b/AI/Nullkiller/Behaviors/DefenceBehavior.cpp
@@ -21,7 +21,6 @@
 #include "../Goals/CaptureObject.h"
 #include "../Markers/DefendTown.h"
 #include "../Goals/ExchangeSwapTownHeroes.h"
-#include "lib/CPathfinder.h"

 namespace NKAI
 {
--- a/AI/Nullkiller/Behaviors/GatherArmyBehavior.cpp
+++ b/AI/Nullkiller/Behaviors/GatherArmyBehavior.cpp
@@ -16,7 +16,6 @@
 #include "../Markers/ArmyUpgrade.h"
 #include "GatherArmyBehavior.h"
 #include "../AIUtility.h"
-#include "lib/CPathfinder.h"

 namespace NKAI
 {
--- a/AI/Nullkiller/Behaviors/RecruitHeroBehavior.cpp
+++ b/AI/Nullkiller/Behaviors/RecruitHeroBehavior.cpp
@@ -13,7 +13,6 @@
 #include "../AIUtility.h"
 #include "../Goals/RecruitHero.h"
 #include "../Goals/ExecuteHeroChain.h"
-#include "lib/CPathfinder.h"

 namespace NKAI
 {
--- a/AI/Nullkiller/Behaviors/StartupBehavior.cpp
+++ b/AI/Nullkiller/Behaviors/StartupBehavior.cpp
@@ -16,7 +16,6 @@
 #include "../Goals/ExecuteHeroChain.h"
 #include "../Goals/ExchangeSwapTownHeroes.h"
 #include "lib/mapObjects/MapObjects.h" //for victory conditions
-#include "lib/CPathfinder.h"
 #include "../Engine/Nullkiller.h"

 namespace NKAI
--- a/AI/Nullkiller/Engine/PriorityEvaluator.cpp
+++ b/AI/Nullkiller/Engine/PriorityEvaluator.cpp
@@ -16,7 +16,6 @@
 #include "../../../lib/mapObjectConstructors/CBankInstanceConstructor.h"
 #include "../../../lib/mapObjects/MapObjects.h"
 #include "../../../lib/CCreatureHandler.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/CGameStateFwd.h"
 #include "../../../lib/VCMI_Lib.h"
 #include "../../../lib/StartInfo.h"
--- a/AI/Nullkiller/Goals/AbstractGoal.cpp
+++ b/AI/Nullkiller/Goals/AbstractGoal.cpp
@@ -10,7 +10,6 @@
 #include "StdInc.h"
 #include "AbstractGoal.h"
 #include "../AIGateway.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"

 namespace NKAI
--- a/AI/Nullkiller/Goals/AdventureSpellCast.cpp
+++ b/AI/Nullkiller/Goals/AdventureSpellCast.cpp
@@ -10,7 +10,6 @@
 #include "StdInc.h"
 #include "AdventureSpellCast.h"
 #include "../AIGateway.h"
-#include "../../../lib/CPathfinder.h"

 namespace NKAI
 {
--- a/AI/Nullkiller/Goals/BuildBoat.cpp
+++ b/AI/Nullkiller/Goals/BuildBoat.cpp
@@ -10,7 +10,6 @@
 #include "StdInc.h"
 #include "BuildBoat.h"
 #include "../AIGateway.h"
-#include "../../../lib/CPathfinder.h"
 #include "../Behaviors/CaptureObjectsBehavior.h"

 namespace NKAI
--- a/AI/Nullkiller/Goals/BuildThis.cpp
+++ b/AI/Nullkiller/Goals/BuildThis.cpp
@@ -11,7 +11,6 @@
 #include "BuildThis.h"
 #include "../AIGateway.h"
 #include "../AIUtility.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/Nullkiller/Goals/CompleteQuest.cpp
+++ b/AI/Nullkiller/Goals/CompleteQuest.cpp
@@ -11,7 +11,6 @@
 #include "CompleteQuest.h"
 #include "../Behaviors/CaptureObjectsBehavior.h"
 #include "../AIGateway.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/VCMI_Lib.h"
 #include "../../../lib/CGeneralTextHandler.h"

--- a/AI/Nullkiller/Goals/Composition.cpp
+++ b/AI/Nullkiller/Goals/Composition.cpp
@@ -11,7 +11,6 @@
 #include "Composition.h"
 #include "../AIGateway.h"
 #include "../AIUtility.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/Nullkiller/Goals/DismissHero.cpp
+++ b/AI/Nullkiller/Goals/DismissHero.cpp
@@ -10,7 +10,6 @@
 #include "StdInc.h"
 #include "DismissHero.h"
 #include "../AIGateway.h"
-#include "../../../lib/CPathfinder.h"

 namespace NKAI
 {
--- a/AI/Nullkiller/Goals/ExchangeSwapTownHeroes.cpp
+++ b/AI/Nullkiller/Goals/ExchangeSwapTownHeroes.cpp
@@ -11,7 +11,6 @@
 #include "ExchangeSwapTownHeroes.h"
 #include "ExecuteHeroChain.h"
 #include "../AIGateway.h"
-#include "../../../lib/CPathfinder.h"
 #include "../Engine/Nullkiller.h"

 namespace NKAI
--- a/AI/Nullkiller/Goals/ExecuteHeroChain.cpp
+++ b/AI/Nullkiller/Goals/ExecuteHeroChain.cpp
@@ -10,7 +10,6 @@
 #include "StdInc.h"
 #include "ExecuteHeroChain.h"
 #include "../AIGateway.h"
-#include "../../../lib/CPathfinder.h"
 #include "../Engine/Nullkiller.h"

 namespace NKAI
--- a/AI/Nullkiller/Goals/RecruitHero.cpp
+++ b/AI/Nullkiller/Goals/RecruitHero.cpp
@@ -11,7 +11,6 @@
 #include "Goals.h"
 #include "../AIGateway.h"
 #include "../AIUtility.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/Nullkiller/Goals/SaveResources.cpp
+++ b/AI/Nullkiller/Goals/SaveResources.cpp
@@ -10,7 +10,6 @@
 #include "StdInc.h"
 #include "SaveResources.h"
 #include "../AIGateway.h"
-#include "../../../lib/CPathfinder.h"
 #include "../Behaviors/CaptureObjectsBehavior.h"

 namespace NKAI
--- a/AI/Nullkiller/Pathfinding/Actions/SpecialAction.h
+++ b/AI/Nullkiller/Pathfinding/Actions/SpecialAction.h
@@ -13,6 +13,9 @@
 #include "../../AIUtility.h"
 #include "../../Goals/AbstractGoal.h"

+struct PathNodeInfo;
+struct CDestinationNodeInfo;
+
 namespace NKAI
 {

--- a/AI/VCAI/AIUtility.h
+++ b/AI/VCAI/AIUtility.h
@@ -16,7 +16,6 @@
 #include "../../lib/spells/CSpellHandler.h"
 #include "../../lib/CStopWatch.h"
 #include "../../lib/mapObjects/CGHeroInstance.h"
-#include "../../lib/CPathfinder.h"
 #include "../../CCallback.h"

 class CCallback;
--- a/AI/VCAI/Goals/AbstractGoal.cpp
+++ b/AI/VCAI/Goals/AbstractGoal.cpp
@@ -14,7 +14,6 @@
 #include "../FuzzyHelper.h"
 #include "../ResourceManager.h"
 #include "../BuildingManager.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"

 extern boost::thread_specific_ptr<CCallback> cb;
--- a/AI/VCAI/Goals/AdventureSpellCast.cpp
+++ b/AI/VCAI/Goals/AdventureSpellCast.cpp
@@ -13,7 +13,6 @@
 #include "../FuzzyHelper.h"
 #include "../AIhelper.h"
 #include "../../../lib/mapObjects/CGTownInstance.h"
-#include "../../../lib/CPathfinder.h"

 extern boost::thread_specific_ptr<CCallback> cb;
 extern boost::thread_specific_ptr<VCAI> ai;
--- a/AI/VCAI/Goals/Build.cpp
+++ b/AI/VCAI/Goals/Build.cpp
@@ -17,7 +17,6 @@
 #include "../ResourceManager.h"
 #include "../BuildingManager.h"
 #include "../../../lib/mapObjects/CGTownInstance.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/VCAI/Goals/BuildBoat.cpp
+++ b/AI/VCAI/Goals/BuildBoat.cpp
@@ -12,7 +12,6 @@
 #include "../VCAI.h"
 #include "../FuzzyHelper.h"
 #include "../AIhelper.h"
-#include "../../../lib/CPathfinder.h"

 extern boost::thread_specific_ptr<CCallback> cb;
 extern boost::thread_specific_ptr<VCAI> ai;
--- a/AI/VCAI/Goals/BuildThis.cpp
+++ b/AI/VCAI/Goals/BuildThis.cpp
@@ -16,7 +16,6 @@
 #include "../ResourceManager.h"
 #include "../BuildingManager.h"
 #include "../../../lib/mapObjects/CGTownInstance.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/VCAI/Goals/CollectRes.cpp
+++ b/AI/VCAI/Goals/CollectRes.cpp
@@ -16,7 +16,6 @@
 #include "../ResourceManager.h"
 #include "../BuildingManager.h"
 #include "../../../lib/mapObjects/CGMarket.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/VCAI/Goals/CompleteQuest.cpp
+++ b/AI/VCAI/Goals/CompleteQuest.cpp
@@ -13,7 +13,6 @@
 #include "../FuzzyHelper.h"
 #include "../AIhelper.h"
 #include "../../../lib/mapObjects/CQuest.h"
-#include "../../../lib/CPathfinder.h"

 extern boost::thread_specific_ptr<CCallback> cb;
 extern boost::thread_specific_ptr<VCAI> ai;
--- a/AI/VCAI/Goals/Conquer.cpp
+++ b/AI/VCAI/Goals/Conquer.cpp
@@ -15,7 +15,6 @@
 #include "../FuzzyHelper.h"
 #include "../ResourceManager.h"
 #include "../BuildingManager.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/VCAI/Goals/Explore.cpp
+++ b/AI/VCAI/Goals/Explore.cpp
@@ -15,7 +15,6 @@
 #include "../FuzzyHelper.h"
 #include "../ResourceManager.h"
 #include "../BuildingManager.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"
 #include "../../../lib/CPlayerState.h"

--- a/AI/VCAI/Goals/GatherArmy.cpp
+++ b/AI/VCAI/Goals/GatherArmy.cpp
@@ -16,7 +16,6 @@
 #include "../ResourceManager.h"
 #include "../BuildingManager.h"
 #include "../../../lib/mapObjects/CGTownInstance.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/VCAI/Goals/GatherTroops.cpp
+++ b/AI/VCAI/Goals/GatherTroops.cpp
@@ -16,7 +16,6 @@
 #include "../ResourceManager.h"
 #include "../BuildingManager.h"
 #include "../../../lib/mapObjects/CGTownInstance.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/VCAI/Goals/RecruitHero.cpp
+++ b/AI/VCAI/Goals/RecruitHero.cpp
@@ -15,7 +15,6 @@
 #include "../FuzzyHelper.h"
 #include "../ResourceManager.h"
 #include "../BuildingManager.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/VCAI/Goals/VisitObj.cpp
+++ b/AI/VCAI/Goals/VisitObj.cpp
@@ -15,7 +15,6 @@
 #include "../FuzzyHelper.h"
 #include "../ResourceManager.h"
 #include "../BuildingManager.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/VCAI/Goals/VisitTile.cpp
+++ b/AI/VCAI/Goals/VisitTile.cpp
@@ -15,7 +15,6 @@
 #include "../FuzzyHelper.h"
 #include "../ResourceManager.h"
 #include "../BuildingManager.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/VCAI/Goals/Win.cpp
+++ b/AI/VCAI/Goals/Win.cpp
@@ -17,7 +17,6 @@
 #include "../BuildingManager.h"
 #include "../../../lib/mapping/CMapHeader.h" //for victory conditions
 #include "../../../lib/mapObjects/CGTownInstance.h"
-#include "../../../lib/CPathfinder.h"
 #include "../../../lib/StringConstants.h"


--- a/AI/VCAI/Pathfinding/Actions/ISpecialAction.h
+++ b/AI/VCAI/Pathfinding/Actions/ISpecialAction.h
@@ -14,6 +14,8 @@
 #include "../../Goals/AbstractGoal.h"

 struct AIPathNode;
+struct PathNodeInfo;
+struct CDestinationNodeInfo;

 class ISpecialAction
 {
@@ -29,4 +31,4 @@ public:
 		const AIPathNode * srcNode) const
 	{
 	}
-};
+};