Inicio Explorar Axuda
Rexistro Iniciar sesión
Hero3
/
vcmi
réplica de https://github.com/vcmi/vcmi.git
2
0
Fork 0
Ficheiros Incidencias 0 Wiki
Explorar o código

Removed excessive pathfinder includes

Ivan Savenko %!s(int64=2) %!d(string=hai) anos
pai
02ea798c97
achega
87fcfa4add
Modificáronse 43 ficheiros con 10 adicións e 38 borrados
Dividir vista Mostrar estatísticas de Diff
  1. 0 1
      AI/Nullkiller/AIUtility.h
  2. 0 1
      AI/Nullkiller/Behaviors/BuildingBehavior.cpp
  3. 0 1
      AI/Nullkiller/Behaviors/BuyArmyBehavior.cpp
  4. 0 1
      AI/Nullkiller/Behaviors/DefenceBehavior.cpp
  5. 0 1
      AI/Nullkiller/Behaviors/GatherArmyBehavior.cpp
  6. 0 1
      AI/Nullkiller/Behaviors/RecruitHeroBehavior.cpp
  7. 0 1
      AI/Nullkiller/Behaviors/StartupBehavior.cpp
  8. 0 1
      AI/Nullkiller/Engine/PriorityEvaluator.cpp
  9. 0 1
      AI/Nullkiller/Goals/AbstractGoal.cpp
  10. 0 1
      AI/Nullkiller/Goals/AdventureSpellCast.cpp
  11. 0 1
      AI/Nullkiller/Goals/BuildBoat.cpp
  12. 0 1
      AI/Nullkiller/Goals/BuildThis.cpp
  13. 0 1
      AI/Nullkiller/Goals/CompleteQuest.cpp
  14. 0 1
      AI/Nullkiller/Goals/Composition.cpp
  15. 0 1
      AI/Nullkiller/Goals/DismissHero.cpp
  16. 0 1
      AI/Nullkiller/Goals/ExchangeSwapTownHeroes.cpp
  17. 0 1
      AI/Nullkiller/Goals/ExecuteHeroChain.cpp
  18. 0 1
      AI/Nullkiller/Goals/RecruitHero.cpp
  19. 0 1
      AI/Nullkiller/Goals/SaveResources.cpp
  20. 3 0
      AI/Nullkiller/Pathfinding/Actions/SpecialAction.h
  21. 0 1
      AI/VCAI/AIUtility.h
  22. 0 1
      AI/VCAI/Goals/AbstractGoal.cpp
  23. 0 1
      AI/VCAI/Goals/AdventureSpellCast.cpp
  24. 0 1
      AI/VCAI/Goals/Build.cpp
  25. 0 1
      AI/VCAI/Goals/BuildBoat.cpp
  26. 0 1
      AI/VCAI/Goals/BuildThis.cpp
  27. 0 1
      AI/VCAI/Goals/CollectRes.cpp
  28. 0 1
      AI/VCAI/Goals/CompleteQuest.cpp
  29. 0 1
      AI/VCAI/Goals/Conquer.cpp
  30. 0 1
      AI/VCAI/Goals/Explore.cpp
  31. 0 1
      AI/VCAI/Goals/GatherArmy.cpp
  32. 0 1
      AI/VCAI/Goals/GatherTroops.cpp
  33. 0 1
      AI/VCAI/Goals/RecruitHero.cpp
  34. 0 1
      AI/VCAI/Goals/VisitObj.cpp
  35. 0 1
      AI/VCAI/Goals/VisitTile.cpp
  36. 0 1
      AI/VCAI/Goals/Win.cpp
  37. 3 1
      AI/VCAI/Pathfinding/Actions/ISpecialAction.h
  38. 1 0
      client/Client.cpp
  39. 0 1
      client/Client.h
  40. 1 0
      lib/CGameState.cpp
  41. 0 1
      lib/CGameState.h
  42. 1 0
      lib/mapObjects/CGHeroInstance.cpp
  43. 1 0
      server/CGameHandler.cpp

+ 0 - 1
AI/Nullkiller/AIUtility.h
Ver ficheiro 

@@ -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>

+ 0 - 1
AI/Nullkiller/Behaviors/BuildingBehavior.cpp
Ver ficheiro 

@@ -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

+ 0 - 1
AI/Nullkiller/Behaviors/BuyArmyBehavior.cpp
Ver ficheiro 

@@ -13,7 +13,6 @@
 
 #include "../AIUtility.h"
 
 #include "../Goals/BuyArmy.h"
 
 #include "../Engine/Nullkiller.h"
 
-#include "lib/CPathfinder.h"
 
 
 namespace NKAI
 
 {

+ 0 - 1
AI/Nullkiller/Behaviors/DefenceBehavior.cpp
Ver ficheiro 

@@ -21,7 +21,6 @@
 
 #include "../Goals/CaptureObject.h"
 
 #include "../Markers/DefendTown.h"
 
 #include "../Goals/ExchangeSwapTownHeroes.h"
 
-#include "lib/CPathfinder.h"
 
 
 namespace NKAI
 
 {

+ 0 - 1
AI/Nullkiller/Behaviors/GatherArmyBehavior.cpp
Ver ficheiro 

@@ -16,7 +16,6 @@
 
 #include "../Markers/ArmyUpgrade.h"
 
 #include "GatherArmyBehavior.h"
 
 #include "../AIUtility.h"
 
-#include "lib/CPathfinder.h"
 
 
 namespace NKAI
 
 {

+ 0 - 1
AI/Nullkiller/Behaviors/RecruitHeroBehavior.cpp
Ver ficheiro 

@@ -13,7 +13,6 @@
 
 #include "../AIUtility.h"
 
 #include "../Goals/RecruitHero.h"
 
 #include "../Goals/ExecuteHeroChain.h"
 
-#include "lib/CPathfinder.h"
 
 
 namespace NKAI
 
 {

+ 0 - 1
AI/Nullkiller/Behaviors/StartupBehavior.cpp
Ver ficheiro 

@@ -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

+ 0 - 1
AI/Nullkiller/Engine/PriorityEvaluator.cpp
Ver ficheiro 

@@ -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"

+ 0 - 1
AI/Nullkiller/Goals/AbstractGoal.cpp
Ver ficheiro 

@@ -10,7 +10,6 @@
 
 #include "StdInc.h"
 
 #include "AbstractGoal.h"
 
 #include "../AIGateway.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"
 
 
 namespace NKAI

+ 0 - 1
AI/Nullkiller/Goals/AdventureSpellCast.cpp
Ver ficheiro 

@@ -10,7 +10,6 @@
 
 #include "StdInc.h"
 
 #include "AdventureSpellCast.h"
 
 #include "../AIGateway.h"
 
-#include "../../../lib/CPathfinder.h"
 
 
 namespace NKAI
 
 {

+ 0 - 1
AI/Nullkiller/Goals/BuildBoat.cpp
Ver ficheiro 

@@ -10,7 +10,6 @@
 
 #include "StdInc.h"
 
 #include "BuildBoat.h"
 
 #include "../AIGateway.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../Behaviors/CaptureObjectsBehavior.h"
 
 
 namespace NKAI

+ 0 - 1
AI/Nullkiller/Goals/BuildThis.cpp
Ver ficheiro 

@@ -11,7 +11,6 @@
 
 #include "BuildThis.h"
 
 #include "../AIGateway.h"
 
 #include "../AIUtility.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/Nullkiller/Goals/CompleteQuest.cpp
Ver ficheiro 

@@ -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"

+ 0 - 1
AI/Nullkiller/Goals/Composition.cpp
Ver ficheiro 

@@ -11,7 +11,6 @@
 
 #include "Composition.h"
 
 #include "../AIGateway.h"
 
 #include "../AIUtility.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/Nullkiller/Goals/DismissHero.cpp
Ver ficheiro 

@@ -10,7 +10,6 @@
 
 #include "StdInc.h"
 
 #include "DismissHero.h"
 
 #include "../AIGateway.h"
 
-#include "../../../lib/CPathfinder.h"
 
 
 namespace NKAI
 
 {

+ 0 - 1
AI/Nullkiller/Goals/ExchangeSwapTownHeroes.cpp
Ver ficheiro 

@@ -11,7 +11,6 @@
 
 #include "ExchangeSwapTownHeroes.h"
 
 #include "ExecuteHeroChain.h"
 
 #include "../AIGateway.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../Engine/Nullkiller.h"
 
 
 namespace NKAI

+ 0 - 1
AI/Nullkiller/Goals/ExecuteHeroChain.cpp
Ver ficheiro 

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

+ 0 - 1
AI/Nullkiller/Goals/RecruitHero.cpp
Ver ficheiro 

@@ -11,7 +11,6 @@
 
 #include "Goals.h"
 
 #include "../AIGateway.h"
 
 #include "../AIUtility.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/Nullkiller/Goals/SaveResources.cpp
Ver ficheiro 

@@ -10,7 +10,6 @@
 
 #include "StdInc.h"
 
 #include "SaveResources.h"
 
 #include "../AIGateway.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../Behaviors/CaptureObjectsBehavior.h"
 
 
 namespace NKAI

+ 3 - 0
AI/Nullkiller/Pathfinding/Actions/SpecialAction.h
Ver ficheiro 

@@ -13,6 +13,9 @@
 
 #include "../../AIUtility.h"
 
 #include "../../Goals/AbstractGoal.h"
 
 
+struct PathNodeInfo;
 
+struct CDestinationNodeInfo;
 
+
 
 namespace NKAI
 
 {

+ 0 - 1
AI/VCAI/AIUtility.h
Ver ficheiro 

@@ -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;

+ 0 - 1
AI/VCAI/Goals/AbstractGoal.cpp
Ver ficheiro 

@@ -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;

+ 0 - 1
AI/VCAI/Goals/AdventureSpellCast.cpp
Ver ficheiro 

@@ -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;

+ 0 - 1
AI/VCAI/Goals/Build.cpp
Ver ficheiro 

@@ -17,7 +17,6 @@
 
 #include "../ResourceManager.h"
 
 #include "../BuildingManager.h"
 
 #include "../../../lib/mapObjects/CGTownInstance.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/VCAI/Goals/BuildBoat.cpp
Ver ficheiro 

@@ -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;

+ 0 - 1
AI/VCAI/Goals/BuildThis.cpp
Ver ficheiro 

@@ -16,7 +16,6 @@
 
 #include "../ResourceManager.h"
 
 #include "../BuildingManager.h"
 
 #include "../../../lib/mapObjects/CGTownInstance.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/VCAI/Goals/CollectRes.cpp
Ver ficheiro 

@@ -16,7 +16,6 @@
 
 #include "../ResourceManager.h"
 
 #include "../BuildingManager.h"
 
 #include "../../../lib/mapObjects/CGMarket.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/VCAI/Goals/CompleteQuest.cpp
Ver ficheiro 

@@ -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;

+ 0 - 1
AI/VCAI/Goals/Conquer.cpp
Ver ficheiro 

@@ -15,7 +15,6 @@
 
 #include "../FuzzyHelper.h"
 
 #include "../ResourceManager.h"
 
 #include "../BuildingManager.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/VCAI/Goals/Explore.cpp
Ver ficheiro 

@@ -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"

+ 0 - 1
AI/VCAI/Goals/GatherArmy.cpp
Ver ficheiro 

@@ -16,7 +16,6 @@
 
 #include "../ResourceManager.h"
 
 #include "../BuildingManager.h"
 
 #include "../../../lib/mapObjects/CGTownInstance.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/VCAI/Goals/GatherTroops.cpp
Ver ficheiro 

@@ -16,7 +16,6 @@
 
 #include "../ResourceManager.h"
 
 #include "../BuildingManager.h"
 
 #include "../../../lib/mapObjects/CGTownInstance.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/VCAI/Goals/RecruitHero.cpp
Ver ficheiro 

@@ -15,7 +15,6 @@
 
 #include "../FuzzyHelper.h"
 
 #include "../ResourceManager.h"
 
 #include "../BuildingManager.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/VCAI/Goals/VisitObj.cpp
Ver ficheiro 

@@ -15,7 +15,6 @@
 
 #include "../FuzzyHelper.h"
 
 #include "../ResourceManager.h"
 
 #include "../BuildingManager.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/VCAI/Goals/VisitTile.cpp
Ver ficheiro 

@@ -15,7 +15,6 @@
 
 #include "../FuzzyHelper.h"
 
 #include "../ResourceManager.h"
 
 #include "../BuildingManager.h"
 
-#include "../../../lib/CPathfinder.h"
 
 #include "../../../lib/StringConstants.h"

+ 0 - 1
AI/VCAI/Goals/Win.cpp
Ver ficheiro 

@@ -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"

+ 3 - 1
AI/VCAI/Pathfinding/Actions/ISpecialAction.h
Ver ficheiro 

@@ -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
 
 	{
 
 	}
 
-};
 
+};

+ 1 - 0
client/Client.cpp
Ver ficheiro 

@@ -24,6 +24,7 @@
 
 #include "../CCallback.h"

 #include "../lib/CConfigHandler.h"

 #include "../lib/CGameState.h"

+#include "../lib/CPathfinder.h"

 #include "../lib/CThreadHelper.h"

 #include "../lib/VCMIDirs.h"

 #include "../lib/battle/BattleInfo.h"

+ 0 - 1
client/Client.h
Ver ficheiro 

@@ -18,7 +18,6 @@
 
 #include "../lib/CStopWatch.h"

 #include "../lib/int3.h"

 #include "../lib/CondSh.h"

-#include "../lib/CPathfinder.h"

 

 VCMI_LIB_NAMESPACE_BEGIN

+ 1 - 0
lib/CGameState.cpp
Ver ficheiro 

@@ -15,6 +15,7 @@
 
 #include "CArtHandler.h"
 
 #include "CBuildingHandler.h"
 
 #include "CGeneralTextHandler.h"
 
+#include "CPathfinder.h"
 
 #include "CTownHandler.h"
 
 #include "spells/CSpellHandler.h"
 
 #include "CHeroHandler.h"

+ 0 - 1
lib/CGameState.h
Ver ficheiro 

@@ -20,7 +20,6 @@
 
 #include "int3.h"

 #include "CRandomGenerator.h"

 #include "CGameStateFwd.h"

-#include "CPathfinder.h"

 

 namespace boost

 {

+ 1 - 0
lib/mapObjects/CGHeroInstance.cpp
Ver ficheiro 

@@ -28,6 +28,7 @@
 
 #include "../IGameCallback.h"
 
 #include "../CGameState.h"
 
 #include "../CCreatureHandler.h"
 
+#include "../CPathfinder.h"
 
 #include "../CTownHandler.h"
 
 #include "../mapping/CMap.h"
 
 #include "CGTownInstance.h"

+ 1 - 0
server/CGameHandler.cpp
Ver ficheiro 

@@ -19,6 +19,7 @@
 
 #include "../lib/CArtHandler.h"
 
 #include "../lib/CBuildingHandler.h"
 
 #include "../lib/CHeroHandler.h"
 
+#include "../lib/CPathfinder.h"
 
 #include "../lib/spells/AbilityCaster.h"
 
 #include "../lib/spells/BonusCaster.h"
 
 #include "../lib/spells/CSpellHandler.h"