games/vcmi
1
0
Fork 0
mirror of https://github.com/vcmi/vcmi.git synced 2024-12-24 22:14:36 +02:00
Code Issues Releases Activity

Remove excessive CMap.h includes

Browse Source
This commit is contained in:
Ivan Savenko 2023-05-24 02:05:59 +03:00
parent 62595cb039
commit acac42291e
114 changed files with 72 additions and 114 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AI/Nullkiller/Analyzers/BuildAnalyzer.cpp
View File

@ -9,7 +9,6 @@
*/ */
#include "../StdInc.h" #include "../StdInc.h"
#include "../Engine/Nullkiller.h" #include "../Engine/Nullkiller.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../Engine/Nullkiller.h" #include "../Engine/Nullkiller.h"
namespace NKAI namespace NKAI

3
AI/Nullkiller/Analyzers/DangerHitMapAnalyzer.cpp
View File

@ -8,7 +8,8 @@
* *
*/ */
#include "../StdInc.h" #include "../StdInc.h"
#include "lib/mapping/CMap.h" //for victory conditions #include "DangerHitMapAnalyzer.h"
#include "../Engine/Nullkiller.h" #include "../Engine/Nullkiller.h"
namespace NKAI namespace NKAI

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

@ -14,6 +14,8 @@
namespace NKAI namespace NKAI
{ {
struct AIPath;
struct HitMapInfo struct HitMapInfo
{ {
static HitMapInfo NoTreat; static HitMapInfo NoTreat;

1
AI/Nullkiller/Analyzers/ObjectClusterizer.cpp
View File

@ -12,7 +12,6 @@
#include "../Goals/ExecuteHeroChain.h" #include "../Goals/ExecuteHeroChain.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../Engine/Nullkiller.h" #include "../Engine/Nullkiller.h"
#include "lib/mapping/CMap.h" //for victory conditions
namespace NKAI namespace NKAI
{ {

1
AI/Nullkiller/Behaviors/BuildingBehavior.cpp
View File

@ -15,7 +15,6 @@
#include "../Goals/Composition.h" #include "../Goals/Composition.h"
#include "../Goals/BuildThis.h" #include "../Goals/BuildThis.h"
#include "../Goals/SaveResources.h" #include "../Goals/SaveResources.h"
#include "lib/mapping/CMap.h" //for victory conditions
#include "lib/CPathfinder.h" #include "lib/CPathfinder.h"
#include "../Engine/Nullkiller.h" #include "../Engine/Nullkiller.h"

1
AI/Nullkiller/Behaviors/BuyArmyBehavior.cpp
View File

@ -13,7 +13,6 @@
#include "../AIUtility.h" #include "../AIUtility.h"
#include "../Goals/BuyArmy.h" #include "../Goals/BuyArmy.h"
#include "../Engine/Nullkiller.h" #include "../Engine/Nullkiller.h"
#include "lib/mapping/CMap.h" //for victory conditions
#include "lib/CPathfinder.h" #include "lib/CPathfinder.h"
namespace NKAI namespace NKAI

1
AI/Nullkiller/Behaviors/DefenceBehavior.cpp
View File

@ -21,7 +21,6 @@
#include "../Goals/CaptureObject.h" #include "../Goals/CaptureObject.h"
#include "../Markers/DefendTown.h" #include "../Markers/DefendTown.h"
#include "../Goals/ExchangeSwapTownHeroes.h" #include "../Goals/ExchangeSwapTownHeroes.h"
#include "lib/mapping/CMap.h" //for victory conditions
#include "lib/CPathfinder.h" #include "lib/CPathfinder.h"
namespace NKAI namespace NKAI

1
AI/Nullkiller/Behaviors/GatherArmyBehavior.cpp
View File

@ -16,7 +16,6 @@
#include "../Markers/ArmyUpgrade.h" #include "../Markers/ArmyUpgrade.h"
#include "GatherArmyBehavior.h" #include "GatherArmyBehavior.h"
#include "../AIUtility.h" #include "../AIUtility.h"
#include "lib/mapping/CMap.h" //for victory conditions
#include "lib/CPathfinder.h" #include "lib/CPathfinder.h"
namespace NKAI namespace NKAI

1
AI/Nullkiller/Behaviors/RecruitHeroBehavior.cpp
View File

@ -13,7 +13,6 @@
#include "../AIUtility.h" #include "../AIUtility.h"
#include "../Goals/RecruitHero.h" #include "../Goals/RecruitHero.h"
#include "../Goals/ExecuteHeroChain.h" #include "../Goals/ExecuteHeroChain.h"
#include "lib/mapping/CMap.h" //for victory conditions
#include "lib/CPathfinder.h" #include "lib/CPathfinder.h"
namespace NKAI namespace NKAI

1
AI/Nullkiller/Behaviors/StartupBehavior.cpp
View File

@ -15,7 +15,6 @@
#include "../Goals/RecruitHero.h" #include "../Goals/RecruitHero.h"
#include "../Goals/ExecuteHeroChain.h" #include "../Goals/ExecuteHeroChain.h"
#include "../Goals/ExchangeSwapTownHeroes.h" #include "../Goals/ExchangeSwapTownHeroes.h"
#include "lib/mapping/CMap.h" //for victory conditions
#include "lib/mapObjects/MapObjects.h" //for victory conditions #include "lib/mapObjects/MapObjects.h" //for victory conditions
#include "lib/CPathfinder.h" #include "lib/CPathfinder.h"
#include "../Engine/Nullkiller.h" #include "../Engine/Nullkiller.h"

1
AI/Nullkiller/Goals/AbstractGoal.cpp
View File

@ -10,7 +10,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "AbstractGoal.h" #include "AbstractGoal.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

1
AI/Nullkiller/Goals/AdventureSpellCast.cpp
View File

@ -10,7 +10,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "AdventureSpellCast.h" #include "AdventureSpellCast.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
namespace NKAI namespace NKAI

1
AI/Nullkiller/Goals/BuildBoat.cpp
View File

@ -10,7 +10,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "BuildBoat.h" #include "BuildBoat.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../Behaviors/CaptureObjectsBehavior.h" #include "../Behaviors/CaptureObjectsBehavior.h"

1
AI/Nullkiller/Goals/BuildThis.cpp
View File

@ -11,7 +11,6 @@
#include "BuildThis.h" #include "BuildThis.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../AIUtility.h" #include "../AIUtility.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

1
AI/Nullkiller/Goals/CompleteQuest.cpp
View File

@ -11,7 +11,6 @@
#include "CompleteQuest.h" #include "CompleteQuest.h"
#include "../Behaviors/CaptureObjectsBehavior.h" #include "../Behaviors/CaptureObjectsBehavior.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/VCMI_Lib.h" #include "../../../lib/VCMI_Lib.h"
#include "../../../lib/CGeneralTextHandler.h" #include "../../../lib/CGeneralTextHandler.h"

1
AI/Nullkiller/Goals/Composition.cpp
View File

@ -11,7 +11,6 @@
#include "Composition.h" #include "Composition.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../AIUtility.h" #include "../AIUtility.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

1
AI/Nullkiller/Goals/DismissHero.cpp
View File

@ -10,7 +10,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "DismissHero.h" #include "DismissHero.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
namespace NKAI namespace NKAI

1
AI/Nullkiller/Goals/ExchangeSwapTownHeroes.cpp
View File

@ -11,7 +11,6 @@
#include "ExchangeSwapTownHeroes.h" #include "ExchangeSwapTownHeroes.h"
#include "ExecuteHeroChain.h" #include "ExecuteHeroChain.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../Engine/Nullkiller.h" #include "../Engine/Nullkiller.h"

1
AI/Nullkiller/Goals/ExecuteHeroChain.cpp
View File

@ -10,7 +10,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "ExecuteHeroChain.h" #include "ExecuteHeroChain.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../Engine/Nullkiller.h" #include "../Engine/Nullkiller.h"

1
AI/Nullkiller/Goals/RecruitHero.cpp
View File

@ -11,7 +11,6 @@
#include "Goals.h" #include "Goals.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../AIUtility.h" #include "../AIUtility.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

1
AI/Nullkiller/Goals/SaveResources.cpp
View File

@ -10,7 +10,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "SaveResources.h" #include "SaveResources.h"
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../Behaviors/CaptureObjectsBehavior.h" #include "../Behaviors/CaptureObjectsBehavior.h"

1
AI/Nullkiller/Pathfinding/Actions/BattleAction.cpp
View File

@ -12,7 +12,6 @@
#include "BattleAction.h" #include "BattleAction.h"
#include "../../AIGateway.h" #include "../../AIGateway.h"
#include "../../Goals/CompleteQuest.h" #include "../../Goals/CompleteQuest.h"
#include "../../../../lib/mapping/CMap.h" //for victory conditions
namespace NKAI namespace NKAI
{ {

1
AI/Nullkiller/Pathfinding/Actions/BoatActions.cpp
View File

@ -14,7 +14,6 @@
#include "../../Goals/CaptureObject.h" #include "../../Goals/CaptureObject.h"
#include "../../Goals/Invalid.h" #include "../../Goals/Invalid.h"
#include "../../Goals/BuildBoat.h" #include "../../Goals/BuildBoat.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
#include "BoatActions.h" #include "BoatActions.h"

1
AI/Nullkiller/Pathfinding/Actions/BoatActions.h
View File

@ -11,7 +11,6 @@
#pragma once #pragma once
#include "SpecialAction.h" #include "SpecialAction.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
namespace NKAI namespace NKAI

1
AI/Nullkiller/Pathfinding/Actions/BuyArmyAction.cpp
View File

@ -12,7 +12,6 @@
#include "BuyArmyAction.h" #include "BuyArmyAction.h"
#include "../../AIGateway.h" #include "../../AIGateway.h"
#include "../../Goals/CompleteQuest.h" #include "../../Goals/CompleteQuest.h"
#include "../../../../lib/mapping/CMap.h" //for victory conditions
namespace NKAI namespace NKAI
{ {

1
AI/Nullkiller/Pathfinding/Actions/QuestAction.cpp
View File

@ -12,7 +12,6 @@
#include "QuestAction.h" #include "QuestAction.h"
#include "../../AIGateway.h" #include "../../AIGateway.h"
#include "../../Goals/CompleteQuest.h" #include "../../Goals/CompleteQuest.h"
#include "../../../../lib/mapping/CMap.h" //for victory conditions
namespace NKAI namespace NKAI
{ {

1
AI/Nullkiller/Pathfinding/Actions/TownPortalAction.cpp
View File

@ -10,7 +10,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "../../Goals/AdventureSpellCast.h" #include "../../Goals/AdventureSpellCast.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
#include "TownPortalAction.h" #include "TownPortalAction.h"

1
AI/Nullkiller/Pathfinding/Actions/TownPortalAction.h
View File

@ -11,7 +11,6 @@
#pragma once #pragma once
#include "SpecialAction.h" #include "SpecialAction.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
#include "../../Goals/AdventureSpellCast.h" #include "../../Goals/AdventureSpellCast.h"

1
AI/Nullkiller/Pathfinding/Actors.cpp
View File

@ -12,7 +12,6 @@
#include "../AIGateway.h" #include "../AIGateway.h"
#include "../Engine/Nullkiller.h" #include "../Engine/Nullkiller.h"
#include "../../../CCallback.h" #include "../../../CCallback.h"
#include "../../../lib/mapping/CMap.h"
#include "../../../lib/mapObjects/MapObjects.h" #include "../../../lib/mapObjects/MapObjects.h"
#include "Actions/BuyArmyAction.h" #include "Actions/BuyArmyAction.h"

1
AI/Nullkiller/Pathfinding/Rules/AILayerTransitionRule.h
View File

@ -14,7 +14,6 @@
#include "../../AIGateway.h" #include "../../AIGateway.h"
#include "../Actions/BoatActions.h" #include "../Actions/BoatActions.h"
#include "../../../../CCallback.h" #include "../../../../CCallback.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
namespace NKAI namespace NKAI

1
AI/Nullkiller/Pathfinding/Rules/AIMovementAfterDestinationRule.h
View File

@ -13,7 +13,6 @@
#include "../AINodeStorage.h" #include "../AINodeStorage.h"
#include "../../AIGateway.h" #include "../../AIGateway.h"
#include "../../../../CCallback.h" #include "../../../../CCallback.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
namespace NKAI namespace NKAI

1
AI/Nullkiller/Pathfinding/Rules/AIMovementToDestinationRule.h
View File

@ -13,7 +13,6 @@
#include "../AINodeStorage.h" #include "../AINodeStorage.h"
#include "../../AIGateway.h" #include "../../AIGateway.h"
#include "../../../../CCallback.h" #include "../../../../CCallback.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
namespace NKAI namespace NKAI

1
AI/Nullkiller/Pathfinding/Rules/AIPreviousNodeRule.h
View File

@ -13,7 +13,6 @@
#include "../AINodeStorage.h" #include "../AINodeStorage.h"
#include "../../AIGateway.h" #include "../../AIGateway.h"
#include "../../../../CCallback.h" #include "../../../../CCallback.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
namespace NKAI namespace NKAI

1
AI/VCAI/Goals/AbstractGoal.cpp
View File

@ -14,7 +14,6 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

2
AI/VCAI/Goals/AdventureSpellCast.cpp
View File

@ -12,7 +12,7 @@
#include "../VCAI.h" #include "../VCAI.h"
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../AIhelper.h" #include "../AIhelper.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions #include "../../../lib/mapObjects/CGTownInstance.h"
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
extern boost::thread_specific_ptr<CCallback> cb; extern boost::thread_specific_ptr<CCallback> cb;

2
AI/VCAI/Goals/Build.cpp
View File

@ -16,7 +16,7 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions #include "../../../lib/mapObjects/CGTownInstance.h"
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

1
AI/VCAI/Goals/BuildBoat.cpp
View File

@ -12,7 +12,6 @@
#include "../VCAI.h" #include "../VCAI.h"
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../AIhelper.h" #include "../AIhelper.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
extern boost::thread_specific_ptr<CCallback> cb; extern boost::thread_specific_ptr<CCallback> cb;

2
AI/VCAI/Goals/BuildThis.cpp
View File

@ -15,7 +15,7 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions #include "../../../lib/mapObjects/CGTownInstance.h"
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

2
AI/VCAI/Goals/CollectRes.cpp
View File

@ -15,7 +15,7 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions #include "../../../lib/mapObjects/CGMarket.h"
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

2
AI/VCAI/Goals/CompleteQuest.cpp
View File

@ -12,7 +12,7 @@
#include "../VCAI.h" #include "../VCAI.h"
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../AIhelper.h" #include "../AIhelper.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions #include "../../../lib/mapObjects/CQuest.h"
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
extern boost::thread_specific_ptr<CCallback> cb; extern boost::thread_specific_ptr<CCallback> cb;

1
AI/VCAI/Goals/Conquer.cpp
View File

@ -15,7 +15,6 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

1
AI/VCAI/Goals/Explore.cpp
View File

@ -15,7 +15,6 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"
#include "../../../lib/CPlayerState.h" #include "../../../lib/CPlayerState.h"

2
AI/VCAI/Goals/GatherArmy.cpp
View File

@ -15,7 +15,7 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions #include "../../../lib/mapObjects/CGTownInstance.h"
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

2
AI/VCAI/Goals/GatherTroops.cpp
View File

@ -15,7 +15,7 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions #include "../../../lib/mapObjects/CGTownInstance.h"
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

1
AI/VCAI/Goals/RecruitHero.cpp
View File

@ -15,7 +15,6 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

2
AI/VCAI/Goals/VisitHero.cpp
View File

@ -17,8 +17,6 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
extern boost::thread_specific_ptr<CCallback> cb; extern boost::thread_specific_ptr<CCallback> cb;
extern boost::thread_specific_ptr<VCAI> ai; extern boost::thread_specific_ptr<VCAI> ai;

1
AI/VCAI/Goals/VisitObj.cpp
View File

@ -15,7 +15,6 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

1
AI/VCAI/Goals/VisitTile.cpp
View File

@ -15,7 +15,6 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

3
AI/VCAI/Goals/Win.cpp
View File

@ -15,7 +15,8 @@
#include "../FuzzyHelper.h" #include "../FuzzyHelper.h"
#include "../ResourceManager.h" #include "../ResourceManager.h"
#include "../BuildingManager.h" #include "../BuildingManager.h"
#include "../../../lib/mapping/CMap.h" //for victory conditions #include "../../../lib/mapping/CMapHeader.h" //for victory conditions
#include "../../../lib/mapObjects/CGTownInstance.h"
#include "../../../lib/CPathfinder.h" #include "../../../lib/CPathfinder.h"
#include "../../../lib/StringConstants.h" #include "../../../lib/StringConstants.h"

2
AI/VCAI/Pathfinding/AIPathfinder.cpp
View File

@ -11,7 +11,7 @@
#include "AIPathfinder.h" #include "AIPathfinder.h"
#include "AIPathfinderConfig.h" #include "AIPathfinderConfig.h"
#include "../../../CCallback.h" #include "../../../CCallback.h"
#include "../../../lib/mapping/CMap.h" #include "../../../lib/mapping/CMapDefines.h"
std::vector<std::shared_ptr<AINodeStorage>> AIPathfinder::storagePool; std::vector<std::shared_ptr<AINodeStorage>> AIPathfinder::storagePool;
std::map<HeroPtr, std::shared_ptr<AINodeStorage>> AIPathfinder::storageMap; std::map<HeroPtr, std::shared_ptr<AINodeStorage>> AIPathfinder::storageMap;

3
AI/VCAI/Pathfinding/Actions/BoatActions.cpp
View File

@ -11,7 +11,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "../../Goals/AdventureSpellCast.h" #include "../../Goals/AdventureSpellCast.h"
#include "../../Goals/BuildBoat.h" #include "../../Goals/BuildBoat.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
#include "BoatActions.h" #include "BoatActions.h"
@ -58,4 +57,4 @@ namespace AIPathfinding
return hero->getSpellCost(summonBoat.toSpell()); return hero->getSpellCost(summonBoat.toSpell());
} }
} }

3
AI/VCAI/Pathfinding/Actions/BoatActions.h
View File

@ -11,7 +11,6 @@
#pragma once #pragma once
#include "ISpecialAction.h" #include "ISpecialAction.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
namespace AIPathfinding namespace AIPathfinding
@ -69,4 +68,4 @@ namespace AIPathfinding
virtual Goals::TSubgoal whatToDo(const HeroPtr & hero) const override; virtual Goals::TSubgoal whatToDo(const HeroPtr & hero) const override;
}; };
} }

3
AI/VCAI/Pathfinding/Actions/TownPortalAction.cpp
View File

@ -10,7 +10,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "../../Goals/AdventureSpellCast.h" #include "../../Goals/AdventureSpellCast.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
#include "TownPortalAction.h" #include "TownPortalAction.h"
@ -21,4 +20,4 @@ Goals::TSubgoal TownPortalAction::whatToDo(const HeroPtr & hero) const
const CGTownInstance * targetTown = target; // const pointer is not allowed in settown const CGTownInstance * targetTown = target; // const pointer is not allowed in settown
return Goals::sptr(Goals::AdventureSpellCast(hero, SpellID::TOWN_PORTAL).settown(targetTown).settile(targetTown->visitablePos())); return Goals::sptr(Goals::AdventureSpellCast(hero, SpellID::TOWN_PORTAL).settown(targetTown).settile(targetTown->visitablePos()));
} }

3
AI/VCAI/Pathfinding/Actions/TownPortalAction.h
View File

@ -11,7 +11,6 @@
#pragma once #pragma once
#include "ISpecialAction.h" #include "ISpecialAction.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
#include "../../Goals/AdventureSpellCast.h" #include "../../Goals/AdventureSpellCast.h"
@ -30,4 +29,4 @@ namespace AIPathfinding
virtual Goals::TSubgoal whatToDo(const HeroPtr & hero) const override; virtual Goals::TSubgoal whatToDo(const HeroPtr & hero) const override;
}; };
} }

3
AI/VCAI/Pathfinding/PathfindingManager.cpp
View File

@ -13,7 +13,8 @@
#include "AIPathfinderConfig.h" #include "AIPathfinderConfig.h"
#include "../Goals/Goals.h" #include "../Goals/Goals.h"
#include "../../../lib/CGameInfoCallback.h" #include "../../../lib/CGameInfoCallback.h"
#include "../../../lib/mapping/CMap.h" #include "../../../lib/mapping/CMapDefines.h"
#include "../../../lib/mapObjects/CQuest.h"
PathfindingManager::PathfindingManager(CPlayerSpecificInfoCallback * CB, VCAI * AI) PathfindingManager::PathfindingManager(CPlayerSpecificInfoCallback * CB, VCAI * AI)
: ai(AI), cb(CB) : ai(AI), cb(CB)

1
AI/VCAI/Pathfinding/Rules/AILayerTransitionRule.h
View File

@ -14,7 +14,6 @@
#include "../../VCAI.h" #include "../../VCAI.h"
#include "../Actions/BoatActions.h" #include "../Actions/BoatActions.h"
#include "../../../../CCallback.h" #include "../../../../CCallback.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
namespace AIPathfinding namespace AIPathfinding

1
AI/VCAI/Pathfinding/Rules/AIMovementAfterDestinationRule.h
View File

@ -13,7 +13,6 @@
#include "../AINodeStorage.h" #include "../AINodeStorage.h"
#include "../../VCAI.h" #include "../../VCAI.h"
#include "../../../../CCallback.h" #include "../../../../CCallback.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
namespace AIPathfinding namespace AIPathfinding

1
AI/VCAI/Pathfinding/Rules/AIMovementToDestinationRule.h
View File

@ -13,7 +13,6 @@
#include "../AINodeStorage.h" #include "../AINodeStorage.h"
#include "../../VCAI.h" #include "../../VCAI.h"
#include "../../../../CCallback.h" #include "../../../../CCallback.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
namespace AIPathfinding namespace AIPathfinding

1
AI/VCAI/Pathfinding/Rules/AIPreviousNodeRule.h
View File

@ -13,7 +13,6 @@
#include "../AINodeStorage.h" #include "../AINodeStorage.h"
#include "../../VCAI.h" #include "../../VCAI.h"
#include "../../../../CCallback.h" #include "../../../../CCallback.h"
#include "../../../../lib/mapping/CMap.h"
#include "../../../../lib/mapObjects/MapObjects.h" #include "../../../../lib/mapObjects/MapObjects.h"
namespace AIPathfinding namespace AIPathfinding

3
client/CPlayerInterface.cpp
View File

@ -53,13 +53,14 @@
#include "../lib/spells/CSpellHandler.h" #include "../lib/spells/CSpellHandler.h"
#include "../lib/CTownHandler.h" #include "../lib/CTownHandler.h"
#include "../lib/mapObjects/CObjectClassesHandler.h" // For displaying correct UI when interacting with objects #include "../lib/mapObjects/CObjectClassesHandler.h" // For displaying correct UI when interacting with objects
#include "../lib/mapObjects/CGTownInstance.h"
#include "../lib/mapObjects/MiscObjects.h"
#include "../lib/CStack.h" #include "../lib/CStack.h"
#include "../lib/JsonNode.h" #include "../lib/JsonNode.h"
#include "CMusicHandler.h" #include "CMusicHandler.h"
#include "../lib/CondSh.h" #include "../lib/CondSh.h"
#include "../lib/NetPacksBase.h" #include "../lib/NetPacksBase.h"
#include "../lib/NetPacks.h"//todo: remove #include "../lib/NetPacks.h"//todo: remove
#include "../lib/mapping/CMap.h"
#include "../lib/VCMIDirs.h" #include "../lib/VCMIDirs.h"
#include "../lib/CStopWatch.h" #include "../lib/CStopWatch.h"
#include "../lib/StartInfo.h" #include "../lib/StartInfo.h"

1
client/CServerHandler.cpp
View File

@ -42,7 +42,6 @@
#include "../lib/StartInfo.h" #include "../lib/StartInfo.h"
#include "../lib/VCMIDirs.h" #include "../lib/VCMIDirs.h"
#include "../lib/mapping/CCampaignHandler.h" #include "../lib/mapping/CCampaignHandler.h"
#include "../lib/mapping/CMap.h"
#include "../lib/mapping/CMapInfo.h" #include "../lib/mapping/CMapInfo.h"
#include "../lib/mapObjects/MiscObjects.h" #include "../lib/mapObjects/MiscObjects.h"
#include "../lib/rmg/CMapGenOptions.h" #include "../lib/rmg/CMapGenOptions.h"

3
client/adventureMap/AdventureMapInterface.cpp
View File

@ -37,8 +37,9 @@
#include "../../lib/CGeneralTextHandler.h" #include "../../lib/CGeneralTextHandler.h"
#include "../../lib/spells/CSpellHandler.h" #include "../../lib/spells/CSpellHandler.h"
#include "../../lib/mapObjects/CGHeroInstance.h" #include "../../lib/mapObjects/CGHeroInstance.h"
#include "../../lib/mapObjects/CGTownInstance.h"
#include "../../lib/CPathfinder.h" #include "../../lib/CPathfinder.h"
#include "../../lib/mapping/CMap.h" #include "../../lib/mapping/CMapDefines.h"
std::shared_ptr<AdventureMapInterface> adventureInt; std::shared_ptr<AdventureMapInterface> adventureInt;

2
client/lobby/CCampaignInfoScreen.cpp
View File

@ -15,7 +15,7 @@
#include "../../lib/CGeneralTextHandler.h" #include "../../lib/CGeneralTextHandler.h"
#include "../../lib/StartInfo.h" #include "../../lib/StartInfo.h"
#include "../../lib/mapping/CMapInfo.h" #include "../../lib/mapping/CMapInfo.h"
#include "../../lib/mapping/CMap.h" #include "../../lib/mapping/CMapHeader.h"
#include "../gui/CGuiHandler.h" #include "../gui/CGuiHandler.h"
#include "../CGameInfo.h" #include "../CGameInfo.h"
#include "../CPlayerInterface.h" #include "../CPlayerInterface.h"

2
client/lobby/CSavingScreen.cpp
View File

@ -25,7 +25,7 @@
#include "../../lib/StartInfo.h" #include "../../lib/StartInfo.h"
#include "../../lib/filesystem/Filesystem.h" #include "../../lib/filesystem/Filesystem.h"
#include "../../lib/mapping/CMapInfo.h" #include "../../lib/mapping/CMapInfo.h"
#include "../../lib/mapping/CMap.h" #include "../../lib/mapping/CMapHeader.h"
CSavingScreen::CSavingScreen() CSavingScreen::CSavingScreen()
: CSelectionBase(ESelectionScreen::saveGame) : CSelectionBase(ESelectionScreen::saveGame)

2
client/lobby/CScenarioInfoScreen.cpp
View File

@ -23,7 +23,7 @@
#include "../../lib/CGeneralTextHandler.h" #include "../../lib/CGeneralTextHandler.h"
#include "../../lib/StartInfo.h" #include "../../lib/StartInfo.h"
#include "../../lib/mapping/CMapInfo.h" #include "../../lib/mapping/CMapInfo.h"
#include "../../lib/mapping/CMap.h" #include "../../lib/mapping/CMapHeader.h"
CScenarioInfoScreen::CScenarioInfoScreen() CScenarioInfoScreen::CScenarioInfoScreen()
{ {

2
client/lobby/CSelectionBase.cpp
View File

@ -43,7 +43,7 @@
#include "../../lib/CThreadHelper.h" #include "../../lib/CThreadHelper.h"
#include "../../lib/filesystem/Filesystem.h" #include "../../lib/filesystem/Filesystem.h"
#include "../../lib/mapping/CMapInfo.h" #include "../../lib/mapping/CMapInfo.h"
#include "../../lib/mapping/CMap.h" #include "../../lib/mapping/CMapHeader.h"
#include "../../lib/serializer/Connection.h" #include "../../lib/serializer/Connection.h"
ISelectionScreenInfo::ISelectionScreenInfo(ESelectionScreen ScreenType) ISelectionScreenInfo::ISelectionScreenInfo(ESelectionScreen ScreenType)

2
client/lobby/OptionsTab.cpp
View File

@ -29,8 +29,8 @@
#include "../../lib/CArtHandler.h" #include "../../lib/CArtHandler.h"
#include "../../lib/CTownHandler.h" #include "../../lib/CTownHandler.h"
#include "../../lib/CHeroHandler.h" #include "../../lib/CHeroHandler.h"
#include "../../lib/mapping/CMap.h"
#include "../../lib/mapping/CMapInfo.h" #include "../../lib/mapping/CMapInfo.h"
#include "../../lib/mapping/CMapHeader.h"
OptionsTab::OptionsTab() : humanPlayers(0) OptionsTab::OptionsTab() : humanPlayers(0)
{ {

2
client/lobby/RandomMapTab.cpp
View File

@ -27,7 +27,7 @@
#include "../../lib/CGeneralTextHandler.h" #include "../../lib/CGeneralTextHandler.h"
#include "../../lib/mapping/CMapInfo.h" #include "../../lib/mapping/CMapInfo.h"
#include "../../lib/mapping/CMap.h" #include "../../lib/mapping/CMapHeader.h"
#include "../../lib/mapping/MapFormat.h" #include "../../lib/mapping/MapFormat.h"
#include "../../lib/rmg/CMapGenOptions.h" #include "../../lib/rmg/CMapGenOptions.h"
#include "../../lib/CModHandler.h" #include "../../lib/CModHandler.h"

2
client/lobby/SelectionTab.cpp
View File

@ -36,7 +36,7 @@
#include "../../lib/GameSettings.h" #include "../../lib/GameSettings.h"
#include "../../lib/filesystem/Filesystem.h" #include "../../lib/filesystem/Filesystem.h"
#include "../../lib/mapping/CMapInfo.h" #include "../../lib/mapping/CMapInfo.h"
#include "../../lib/mapping/CMap.h" #include "../../lib/mapping/CMapHeader.h"
#include "../../lib/mapping/MapFormat.h" #include "../../lib/mapping/MapFormat.h"
#include "../../lib/mapping/CCampaignHandler.h" #include "../../lib/mapping/CCampaignHandler.h"
#include "../../lib/serializer/Connection.h" #include "../../lib/serializer/Connection.h"

1
client/mainmenu/CMainMenu.cpp
View File

@ -46,7 +46,6 @@
#include "../../lib/filesystem/Filesystem.h" #include "../../lib/filesystem/Filesystem.h"
#include "../../lib/filesystem/CCompressedStream.h" #include "../../lib/filesystem/CCompressedStream.h"
#include "../../lib/VCMIDirs.h" #include "../../lib/VCMIDirs.h"
#include "../../lib/mapping/CMap.h"
#include "../../lib/CStopWatch.h" #include "../../lib/CStopWatch.h"
#include "../../lib/NetPacksLobby.h" #include "../../lib/NetPacksLobby.h"
#include "../../lib/CThreadHelper.h" #include "../../lib/CThreadHelper.h"

2
client/mapView/MapRenderer.cpp
View File

@ -27,7 +27,7 @@
#include "../../lib/TerrainHandler.h" #include "../../lib/TerrainHandler.h"
#include "../../lib/mapObjects/CGHeroInstance.h" #include "../../lib/mapObjects/CGHeroInstance.h"
#include "../../lib/mapObjects/MiscObjects.h" #include "../../lib/mapObjects/MiscObjects.h"
#include "../../lib/mapping/CMap.h" #include "../../lib/mapping/CMapDefines.h"
struct NeighborTilesInfo struct NeighborTilesInfo
{ {

1
client/mapView/MapView.cpp
View File

@ -30,7 +30,6 @@
#include "../../lib/CConfigHandler.h" #include "../../lib/CConfigHandler.h"
#include "../../lib/mapObjects/CGHeroInstance.h" #include "../../lib/mapObjects/CGHeroInstance.h"
#include "../../lib/mapping/CMap.h"
BasicMapView::~BasicMapView() = default; BasicMapView::~BasicMapView() = default;

2
client/windows/GUIClasses.cpp
View File

@ -46,6 +46,7 @@
#include "../../CCallback.h" #include "../../CCallback.h"
#include "../lib/mapObjects/CGHeroInstance.h" #include "../lib/mapObjects/CGHeroInstance.h"
#include "../lib/mapObjects/CGTownInstance.h"
#include "../lib/CArtHandler.h" #include "../lib/CArtHandler.h"
#include "../lib/CBuildingHandler.h" #include "../lib/CBuildingHandler.h"
#include "../lib/CConfigHandler.h" #include "../lib/CConfigHandler.h"
@ -63,7 +64,6 @@
#include "../lib/CTownHandler.h" #include "../lib/CTownHandler.h"
#include "../lib/GameConstants.h" #include "../lib/GameConstants.h"
#include "../lib/bonuses/Bonus.h" #include "../lib/bonuses/Bonus.h"
#include "../lib/mapping/CMap.h"
#include "../lib/NetPacksBase.h" #include "../lib/NetPacksBase.h"
#include "../lib/StartInfo.h" #include "../lib/StartInfo.h"
#include "../lib/TextOperations.h" #include "../lib/TextOperations.h"

3
lib/StartInfo.cpp
View File

@ -12,10 +12,11 @@
#include "CGeneralTextHandler.h" #include "CGeneralTextHandler.h"
#include "CModHandler.h" #include "CModHandler.h"
#include "VCMI_Lib.h"
#include "rmg/CMapGenOptions.h" #include "rmg/CMapGenOptions.h"
#include "mapping/CMapInfo.h" #include "mapping/CMapInfo.h"
#include "mapping/CCampaignHandler.h" #include "mapping/CCampaignHandler.h"
#include "mapping/CMap.h" #include "mapping/CMapHeader.h"
#include "mapping/CMapService.h" #include "mapping/CMapService.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN

2
lib/mapObjects/CommonConstructors.cpp
View File

@ -14,7 +14,7 @@
#include "CGHeroInstance.h" #include "CGHeroInstance.h"
#include "CBank.h" #include "CBank.h"
#include "../TerrainHandler.h" #include "../TerrainHandler.h"
#include "../mapping/CMap.h" #include "../mapping/CMapDefines.h"
#include "../CHeroHandler.h" #include "../CHeroHandler.h"
#include "../CGeneralTextHandler.h" #include "../CGeneralTextHandler.h"
#include "../CCreatureHandler.h" #include "../CCreatureHandler.h"

1
lib/mapping/CMapEditManager.cpp
View File

@ -15,7 +15,6 @@
#include "../mapObjects/CGHeroInstance.h" #include "../mapObjects/CGHeroInstance.h"
#include "../VCMI_Lib.h" #include "../VCMI_Lib.h"
#include "CDrawRoadsOperation.h" #include "CDrawRoadsOperation.h"
#include "../mapping/CMap.h"
#include "CMapOperation.h" #include "CMapOperation.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN

2
lib/mapping/CMapInfo.cpp
View File

@ -14,7 +14,7 @@
#include "../StartInfo.h" #include "../StartInfo.h"
#include "../GameConstants.h" #include "../GameConstants.h"
#include "CMapService.h" #include "CMapService.h"
#include "CMap.h" #include "CMapHeader.h"
#include "CCampaignHandler.h" #include "CCampaignHandler.h"
#include "MapFormat.h" #include "MapFormat.h"

1
lib/mapping/CMapService.cpp
View File

@ -17,6 +17,7 @@
#include "../filesystem/CMemoryBuffer.h" #include "../filesystem/CMemoryBuffer.h"
#include "../CModHandler.h" #include "../CModHandler.h"
#include "../Languages.h" #include "../Languages.h"
#include "../VCMI_Lib.h"
#include "CMap.h" #include "CMap.h"
#include "MapFormat.h" #include "MapFormat.h"

1
lib/mapping/MapFeaturesH3M.cpp
View File

@ -11,7 +11,6 @@
#include "StdInc.h" #include "StdInc.h"
#include "MapFeaturesH3M.h" #include "MapFeaturesH3M.h"
#include "CMap.h"
#include "MapFormat.h" #include "MapFormat.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN

2
lib/mapping/MapReaderH3M.cpp
View File

@ -12,7 +12,7 @@
#include "MapReaderH3M.h" #include "MapReaderH3M.h"
#include "../filesystem/CBinaryReader.h" #include "../filesystem/CBinaryReader.h"
#include "CMap.h" #include "../int3.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN

1
lib/registerTypes/RegisterTypes.cpp
View File

@ -14,7 +14,6 @@
#include "../mapping/CMapInfo.h" #include "../mapping/CMapInfo.h"
#include "../StartInfo.h" #include "../StartInfo.h"
#include "../CGameState.h" #include "../CGameState.h"
#include "../mapping/CMap.h"
#include "../mapObjects/CObjectHandler.h" #include "../mapObjects/CObjectHandler.h"
#include "../CCreatureHandler.h" #include "../CCreatureHandler.h"
#include "../spells/CSpellHandler.h" #include "../spells/CSpellHandler.h"

1
lib/registerTypes/TypesClientPacks1.cpp
View File

@ -12,7 +12,6 @@
#include "../StartInfo.h" #include "../StartInfo.h"
#include "../CGameState.h" #include "../CGameState.h"
#include "../mapping/CMap.h"
#include "../CModHandler.h" #include "../CModHandler.h"
#include "../mapObjects/CObjectHandler.h" #include "../mapObjects/CObjectHandler.h"
#include "../CCreatureHandler.h" #include "../CCreatureHandler.h"

1
lib/registerTypes/TypesClientPacks2.cpp
View File

@ -14,7 +14,6 @@
#include "../CStack.h" #include "../CStack.h"
#include "../battle/BattleInfo.h" #include "../battle/BattleInfo.h"
#include "../CGameState.h" #include "../CGameState.h"
#include "../mapping/CMap.h"
#include "../CModHandler.h" #include "../CModHandler.h"
#include "../mapObjects/CObjectHandler.h" #include "../mapObjects/CObjectHandler.h"
#include "../CCreatureHandler.h" #include "../CCreatureHandler.h"

1
lib/registerTypes/TypesMapObjects1.cpp
View File

@ -12,7 +12,6 @@
#include "../StartInfo.h" #include "../StartInfo.h"
#include "../CGameState.h" #include "../CGameState.h"
#include "../mapping/CMap.h"
#include "../CModHandler.h" #include "../CModHandler.h"
#include "../mapObjects/CObjectHandler.h" #include "../mapObjects/CObjectHandler.h"
#include "../CCreatureHandler.h" #include "../CCreatureHandler.h"

1
lib/registerTypes/TypesMapObjects2.cpp
View File

@ -14,7 +14,6 @@
#include "../CStack.h" #include "../CStack.h"
#include "../battle/BattleInfo.h" #include "../battle/BattleInfo.h"
#include "../CGameState.h" #include "../CGameState.h"
#include "../mapping/CMap.h"
#include "../CModHandler.h" #include "../CModHandler.h"
#include "../mapObjects/CObjectHandler.h" #include "../mapObjects/CObjectHandler.h"
#include "../CCreatureHandler.h" #include "../CCreatureHandler.h"

1
lib/registerTypes/TypesMapObjects3.cpp
View File

@ -12,7 +12,6 @@
#include "../StartInfo.h" #include "../StartInfo.h"
#include "../CGameState.h" #include "../CGameState.h"
#include "../mapping/CMap.h"
#include "../CModHandler.h" #include "../CModHandler.h"
#include "../mapObjects/CObjectHandler.h" #include "../mapObjects/CObjectHandler.h"
#include "../CCreatureHandler.h" #include "../CCreatureHandler.h"

1
lib/registerTypes/TypesServerPacks.cpp
View File

@ -12,7 +12,6 @@
#include "../StartInfo.h" #include "../StartInfo.h"
#include "../CGameState.h" #include "../CGameState.h"
#include "../mapping/CMap.h"
#include "../CModHandler.h" #include "../CModHandler.h"
#include "../mapObjects/CObjectHandler.h" #include "../mapObjects/CObjectHandler.h"
#include "../CCreatureHandler.h" #include "../CCreatureHandler.h"

2
lib/rmg/CMapGenOptions.cpp
View File

@ -11,7 +11,7 @@
#include "StdInc.h" #include "StdInc.h"
#include "CMapGenOptions.h" #include "CMapGenOptions.h"
#include "../mapping/CMap.h" #include "../mapping/CMapHeader.h"
#include "CRmgTemplateStorage.h" #include "CRmgTemplateStorage.h"
#include "CRmgTemplate.h" #include "CRmgTemplate.h"
#include "CRandomGenerator.h" #include "CRandomGenerator.h"

1
lib/rmg/CRmgTemplate.cpp
View File

@ -13,7 +13,6 @@
#include <boost/bimap.hpp> #include <boost/bimap.hpp>
#include "CRmgTemplate.h" #include "CRmgTemplate.h"
#include "../mapping/CMap.h"
#include "../VCMI_Lib.h" #include "../VCMI_Lib.h"
#include "../CTownHandler.h" #include "../CTownHandler.h"
#include "../CModHandler.h" #include "../CModHandler.h"

2
lib/rmg/modificators/ConnectionsPlacer.cpp
View File

@ -13,10 +13,8 @@
#include "../CMapGenerator.h" #include "../CMapGenerator.h"
#include "../RmgMap.h" #include "../RmgMap.h"
#include "../../TerrainHandler.h" #include "../../TerrainHandler.h"
#include "../../mapping/CMap.h"
#include "../../mapping/CMapEditManager.h" #include "../../mapping/CMapEditManager.h"
#include "../../mapObjects/CObjectClassesHandler.h" #include "../../mapObjects/CObjectClassesHandler.h"
#include "../RmgPath.h"
#include "../RmgObject.h" #include "../RmgObject.h"
#include "ObjectManager.h" #include "ObjectManager.h"
#include "../Functions.h" #include "../Functions.h"

4
lib/rmg/modificators/MinePlacer.cpp
View File

@ -10,10 +10,8 @@
#include "ConnectionsPlacer.h" #include "ConnectionsPlacer.h"
#include "../CMapGenerator.h" #include "../CMapGenerator.h"
#include "../RmgMap.h" #include "../RmgMap.h"
#include "../../mapping/CMap.h"
#include "../../mapping/CMapEditManager.h" #include "../../mapping/CMapEditManager.h"
#include "../../mapObjects/CObjectClassesHandler.h" #include "../../mapObjects/CObjectClassesHandler.h"
#include "../../spells/CSpellHandler.h" //for choosing random spells
#include "../RmgPath.h" #include "../RmgPath.h"
#include "../RmgObject.h" #include "../RmgObject.h"
#include "ObjectManager.h" #include "ObjectManager.h"
@ -95,4 +93,4 @@ bool MinePlacer::placeMines(ObjectManager & manager)
return true; return true;
} }
VCMI_LIB_NAMESPACE_END VCMI_LIB_NAMESPACE_END

1
lib/rmg/modificators/ObjectManager.cpp
View File

@ -19,7 +19,6 @@
#include "ConnectionsPlacer.h" #include "ConnectionsPlacer.h"
#include "TownPlacer.h" #include "TownPlacer.h"
#include "MinePlacer.h" #include "MinePlacer.h"
#include "TreasurePlacer.h"
#include "QuestArtifactPlacer.h" #include "QuestArtifactPlacer.h"
#include "../../CCreatureHandler.h" #include "../../CCreatureHandler.h"
#include "../../mapObjects/CommonConstructors.h" #include "../../mapObjects/CommonConstructors.h"

4
lib/rmg/modificators/RoadPlacer.cpp
View File

@ -14,11 +14,9 @@
#include "ObstaclePlacer.h" #include "ObstaclePlacer.h"
#include "../Functions.h" #include "../Functions.h"
#include "../CMapGenerator.h" #include "../CMapGenerator.h"
#include "../RmgMap.h"
#include "../threadpool/MapProxy.h" #include "../threadpool/MapProxy.h"
#include "../../mapping/CMapEditManager.h"
#include "../../CModHandler.h" #include "../../CModHandler.h"
#include "../RmgPath.h" #include "../../mapping/CMapEditManager.h"
VCMI_LIB_NAMESPACE_BEGIN VCMI_LIB_NAMESPACE_BEGIN

1
lib/rmg/modificators/WaterAdopter.cpp
View File

@ -12,7 +12,6 @@
#include "WaterAdopter.h" #include "WaterAdopter.h"
#include "../CMapGenerator.h" #include "../CMapGenerator.h"
#include "../RmgMap.h" #include "../RmgMap.h"
#include "../../mapping/CMap.h"
#include "../../mapping/CMapEditManager.h" #include "../../mapping/CMapEditManager.h"
#include "../../mapObjects/CObjectClassesHandler.h" #include "../../mapObjects/CObjectClassesHandler.h"
#include "../RmgPath.h" #include "../RmgPath.h"

2
lib/rmg/modificators/WaterProxy.cpp
View File

@ -45,7 +45,7 @@ void WaterProxy::process()
for([[maybe_unused]] const auto & t : zone.area().getTilesVector()) for([[maybe_unused]] const auto & t : zone.area().getTilesVector())
{ {
assert(map.isOnMap(t)); assert(map.isOnMap(t));
assert(map.map().getTile(t).terType->getId() == zone.getTerrainType()); assert(map.getTile(t).terType->getId() == zone.getTerrainType());
} }
for(const auto & z : map.getZones()) for(const auto & z : map.getZones())

1
lib/rmg/modificators/WaterRoutes.cpp
View File

@ -13,7 +13,6 @@
#include "WaterProxy.h" #include "WaterProxy.h"
#include "../CMapGenerator.h" #include "../CMapGenerator.h"
#include "../RmgMap.h" #include "../RmgMap.h"
#include "../../mapping/CMap.h"
#include "../../mapping/CMapEditManager.h" #include "../../mapping/CMapEditManager.h"
#include "../../mapObjects/CObjectClassesHandler.h" #include "../../mapObjects/CObjectClassesHandler.h"
#include "../RmgPath.h" #include "../RmgPath.h"

2
lib/serializer/Connection.cpp
View File

@ -11,7 +11,7 @@
#include "Connection.h" #include "Connection.h"
#include "../registerTypes/RegisterTypes.h" #include "../registerTypes/RegisterTypes.h"
#include "../mapping/CMap.h" #include "../mapping/CMapHeader.h"
#include "../CGameState.h" #include "../CGameState.h"
#include <boost/asio.hpp> #include <boost/asio.hpp>

1
mapeditor/inspector/questwidget.cpp
View File

@ -16,6 +16,7 @@
#include "../lib/CCreatureHandler.h" #include "../lib/CCreatureHandler.h"
#include "../lib/CHeroHandler.h" #include "../lib/CHeroHandler.h"
#include "../lib/StringConstants.h" #include "../lib/StringConstants.h"
#include "../lib/mapping/CMap.h"
QuestWidget::QuestWidget(const CMap & _map, CGSeerHut & _sh, QWidget *parent) : QuestWidget::QuestWidget(const CMap & _map, CGSeerHut & _sh, QWidget *parent) :
QDialog(parent), QDialog(parent),

1
mapeditor/inspector/questwidget.h
View File

@ -11,7 +11,6 @@
#include "../StdInc.h" #include "../StdInc.h"
#include <QDialog> #include <QDialog>
#include "../lib/mapObjects/CQuest.h" #include "../lib/mapObjects/CQuest.h"
#include "../lib/mapping/CMap.h"
namespace Ui { namespace Ui {
class QuestWidget; class QuestWidget;

1
mapeditor/inspector/rewardswidget.cpp
View File

@ -16,6 +16,7 @@
#include "../lib/CArtHandler.h" #include "../lib/CArtHandler.h"
#include "../lib/CCreatureHandler.h" #include "../lib/CCreatureHandler.h"
#include "../lib/StringConstants.h" #include "../lib/StringConstants.h"
#include "../lib/mapping/CMap.h"
RewardsWidget::RewardsWidget(const CMap & m, CGPandoraBox & p, QWidget *parent) : RewardsWidget::RewardsWidget(const CMap & m, CGPandoraBox & p, QWidget *parent) :
QDialog(parent), QDialog(parent),

Some files were not shown because too many files have changed in this diff Show More