Remove excessive CMap.h includes

AI/Nullkiller/Analyzers/BuildAnalyzer.cpp

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

AI/Nullkiller/Analyzers/DangerHitMapAnalyzer.cpp

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

AI/Nullkiller/Analyzers/DangerHitMapAnalyzer.h

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

AI/Nullkiller/Analyzers/ObjectClusterizer.cpp

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

AI/Nullkiller/Behaviors/BuildingBehavior.cpp

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

AI/Nullkiller/Behaviors/BuyArmyBehavior.cpp

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

AI/Nullkiller/Behaviors/DefenceBehavior.cpp

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

AI/Nullkiller/Behaviors/GatherArmyBehavior.cpp

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

AI/Nullkiller/Behaviors/RecruitHeroBehavior.cpp

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

AI/Nullkiller/Behaviors/StartupBehavior.cpp

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

AI/Nullkiller/Goals/AbstractGoal.cpp

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

AI/Nullkiller/Goals/AdventureSpellCast.cpp

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

AI/Nullkiller/Goals/BuildBoat.cpp

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

AI/Nullkiller/Goals/BuildThis.cpp

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

AI/Nullkiller/Goals/CompleteQuest.cpp

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

AI/Nullkiller/Goals/Composition.cpp

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

AI/Nullkiller/Goals/DismissHero.cpp

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

AI/Nullkiller/Goals/ExchangeSwapTownHeroes.cpp

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

AI/Nullkiller/Goals/ExecuteHeroChain.cpp

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

AI/Nullkiller/Goals/RecruitHero.cpp

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

AI/Nullkiller/Goals/SaveResources.cpp

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

AI/Nullkiller/Pathfinding/Actions/BattleAction.cpp

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

AI/Nullkiller/Pathfinding/Actions/BoatActions.cpp

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

AI/Nullkiller/Pathfinding/Actions/BoatActions.h

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

AI/Nullkiller/Pathfinding/Actions/BuyArmyAction.cpp

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

AI/Nullkiller/Pathfinding/Actions/QuestAction.cpp

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

AI/Nullkiller/Pathfinding/Actions/TownPortalAction.cpp

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

AI/Nullkiller/Pathfinding/Actions/TownPortalAction.h

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

AI/Nullkiller/Pathfinding/Actors.cpp

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

AI/Nullkiller/Pathfinding/Rules/AILayerTransitionRule.h

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

AI/Nullkiller/Pathfinding/Rules/AIMovementAfterDestinationRule.h

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

AI/Nullkiller/Pathfinding/Rules/AIMovementToDestinationRule.h

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

AI/Nullkiller/Pathfinding/Rules/AIPreviousNodeRule.h

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

AI/VCAI/Goals/AbstractGoal.cpp

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

AI/VCAI/Goals/AdventureSpellCast.cpp

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

AI/VCAI/Goals/Build.cpp

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

AI/VCAI/Goals/BuildBoat.cpp

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

AI/VCAI/Goals/BuildThis.cpp

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

AI/VCAI/Goals/CollectRes.cpp

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

AI/VCAI/Goals/CompleteQuest.cpp

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

AI/VCAI/Goals/Conquer.cpp

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

AI/VCAI/Goals/Explore.cpp

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

AI/VCAI/Goals/GatherArmy.cpp

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

AI/VCAI/Goals/GatherTroops.cpp

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

AI/VCAI/Goals/RecruitHero.cpp

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

AI/VCAI/Goals/VisitHero.cpp

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

AI/VCAI/Goals/VisitObj.cpp

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

AI/VCAI/Goals/VisitTile.cpp

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

AI/VCAI/Goals/Win.cpp

@@ -15,7 +15,8 @@
 #include "../FuzzyHelper.h"
 #include "../ResourceManager.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/StringConstants.h"
 

AI/VCAI/Pathfinding/AIPathfinder.cpp

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

AI/VCAI/Pathfinding/Actions/BoatActions.cpp

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

AI/VCAI/Pathfinding/Actions/BoatActions.h

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

AI/VCAI/Pathfinding/Actions/TownPortalAction.cpp

@@ -10,7 +10,6 @@
 
 #include "StdInc.h"
 #include "../../Goals/AdventureSpellCast.h"
-#include "../../../../lib/mapping/CMap.h"
 #include "../../../../lib/mapObjects/MapObjects.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
 
 	return Goals::sptr(Goals::AdventureSpellCast(hero, SpellID::TOWN_PORTAL).settown(targetTown).settile(targetTown->visitablePos()));
-}
+}

AI/VCAI/Pathfinding/Actions/TownPortalAction.h

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

AI/VCAI/Pathfinding/PathfindingManager.cpp

@@ -13,7 +13,8 @@
 #include "AIPathfinderConfig.h"
 #include "../Goals/Goals.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)
 	: ai(AI), cb(CB)

AI/VCAI/Pathfinding/Rules/AILayerTransitionRule.h

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

AI/VCAI/Pathfinding/Rules/AIMovementAfterDestinationRule.h

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

AI/VCAI/Pathfinding/Rules/AIMovementToDestinationRule.h

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

AI/VCAI/Pathfinding/Rules/AIPreviousNodeRule.h

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

client/CPlayerInterface.cpp

@@ -53,13 +53,14 @@
 #include "../lib/spells/CSpellHandler.h"
 #include "../lib/CTownHandler.h"
 #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/JsonNode.h"
 #include "CMusicHandler.h"
 #include "../lib/CondSh.h"
 #include "../lib/NetPacksBase.h"
 #include "../lib/NetPacks.h"//todo: remove
-#include "../lib/mapping/CMap.h"
 #include "../lib/VCMIDirs.h"
 #include "../lib/CStopWatch.h"
 #include "../lib/StartInfo.h"

client/CServerHandler.cpp

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

client/adventureMap/AdventureMapInterface.cpp

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

client/lobby/CCampaignInfoScreen.cpp

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

client/lobby/CSavingScreen.cpp

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

client/lobby/CScenarioInfoScreen.cpp

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

client/lobby/CSelectionBase.cpp

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

client/lobby/OptionsTab.cpp

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

client/lobby/RandomMapTab.cpp

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

client/lobby/SelectionTab.cpp

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

client/mainmenu/CMainMenu.cpp

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

client/mapView/MapRenderer.cpp

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

client/mapView/MapView.cpp

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

client/windows/GUIClasses.cpp

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

lib/StartInfo.cpp

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

lib/mapObjects/CommonConstructors.cpp

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

lib/mapping/CMapEditManager.cpp

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

lib/mapping/CMapInfo.cpp

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

lib/mapping/CMapService.cpp

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

lib/mapping/MapFeaturesH3M.cpp

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

lib/mapping/MapReaderH3M.cpp

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

lib/registerTypes/RegisterTypes.cpp

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

lib/registerTypes/TypesClientPacks1.cpp

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

lib/registerTypes/TypesClientPacks2.cpp

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

lib/registerTypes/TypesMapObjects1.cpp

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

lib/registerTypes/TypesMapObjects2.cpp

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

lib/registerTypes/TypesMapObjects3.cpp

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

lib/registerTypes/TypesServerPacks.cpp

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

lib/rmg/CMapGenOptions.cpp

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

lib/rmg/CRmgTemplate.cpp

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

lib/rmg/modificators/ConnectionsPlacer.cpp

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

lib/rmg/modificators/MinePlacer.cpp

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

lib/rmg/modificators/ObjectManager.cpp

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

lib/rmg/modificators/RoadPlacer.cpp

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

lib/rmg/modificators/WaterAdopter.cpp

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

lib/rmg/modificators/WaterProxy.cpp

@@ -45,7 +45,7 @@ void WaterProxy::process()
 	for([[maybe_unused]] const auto & t : zone.area().getTilesVector())
 	{
 		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())

lib/rmg/modificators/WaterRoutes.cpp

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

lib/serializer/Connection.cpp

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

mapeditor/inspector/questwidget.cpp

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

mapeditor/inspector/questwidget.h

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

mapeditor/inspector/rewardswidget.cpp

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