Fix include paths

lib/rmg/CMapGenerator.cpp

@@ -24,9 +24,9 @@
 #include "Functions.h"
 #include "RmgMap.h"
 #include "threadpool/ThreadPool.h"
-#include "ObjectManager.h"
-#include "TreasurePlacer.h"
-#include "RoadPlacer.h"
+#include "modificators/ObjectManager.h"
+#include "modificators/TreasurePlacer.h"
+#include "modificators/RoadPlacer.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

lib/rmg/RmgMap.cpp

@@ -16,22 +16,22 @@
 #include "../mapping/CMapEditManager.h"
 #include "../mapping/CMap.h"
 #include "../CTownHandler.h"
-#include "ObjectManager.h"
-#include "RoadPlacer.h"
-#include "TreasurePlacer.h"
-#include "QuestArtifactPlacer.h"
-#include "ConnectionsPlacer.h"
-#include "TownPlacer.h"
-#include "MinePlacer.h"
-#include "ObjectDistributor.h"
-#include "WaterAdopter.h"
-#include "WaterProxy.h"
-#include "WaterRoutes.h"
-#include "RockPlacer.h"
-#include "RockFiller.h"
-#include "ObstaclePlacer.h"
-#include "RiverPlacer.h"
-#include "TerrainPainter.h"
+#include "modificators/ObjectManager.h"
+#include "modificators/RoadPlacer.h"
+#include "modificators/TreasurePlacer.h"
+#include "modificators/QuestArtifactPlacer.h"
+#include "modificators/ConnectionsPlacer.h"
+#include "modificators/TownPlacer.h"
+#include "modificators/MinePlacer.h"
+#include "modificators/ObjectDistributor.h"
+#include "modificators/WaterAdopter.h"
+#include "modificators/WaterProxy.h"
+#include "modificators/WaterRoutes.h"
+#include "modificators/RockPlacer.h"
+#include "modificators/RockFiller.h"
+#include "modificators/ObstaclePlacer.h"
+#include "modificators/RiverPlacer.h"
+#include "modificators/TerrainPainter.h"
 #include "Functions.h"
 #include "CMapGenerator.h"
 

lib/rmg/Zone.h

@@ -13,11 +13,12 @@
 #include "../GameConstants.h"
 #include "float3.h"
 #include "../int3.h"
+#include "../CRandomGenerator.h"
 #include "CRmgTemplate.h"
 #include "RmgArea.h"
 #include "RmgPath.h"
 #include "RmgObject.h"
-#include "Modificator.h"
+#include "modificators/Modificator.h"
 
 //uncomment to generate dumps afger every step of map generation
 //#define RMG_DUMP

lib/rmg/modificators/ObjectDistributor.cpp

@@ -11,17 +11,17 @@
 #include "StdInc.h"
 #include "ObjectDistributor.h"
 
-#include "../VCMI_Lib.h"
-#include "RmgMap.h"
-#include "CMapGenerator.h"
+#include "../../VCMI_Lib.h"
+#include "../RmgMap.h"
+#include "../CMapGenerator.h"
 #include "TreasurePlacer.h"
 #include "QuestArtifactPlacer.h"
 #include "TownPlacer.h"
 #include "TerrainPainter.h"
-#include "../mapObjects/CObjectClassesHandler.h"
-#include "../mapObjects/MapObjects.h"
-#include "Functions.h"
-#include "RmgObject.h"
+#include "../../mapObjects/CObjectClassesHandler.h"
+#include "../../mapObjects/MapObjects.h"
+#include "../Functions.h"
+#include "../RmgObject.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

lib/rmg/modificators/ObjectDistributor.h

@@ -10,8 +10,8 @@
 
 #pragma once
 
-#include "Zone.h"
-#include "RmgObject.h"
+#include "../Zone.h"
+#include "../RmgObject.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

lib/rmg/modificators/RockFiller.cpp

@@ -15,14 +15,14 @@
 #include "ObjectManager.h"
 #include "RoadPlacer.h"
 #include "RiverPlacer.h"
-#include "RmgMap.h"
-#include "CMapGenerator.h"
-#include "Functions.h"
-#include "../TerrainHandler.h"
-#include "../CRandomGenerator.h"
-#include "../mapping/CMapEditManager.h"
-#include "TileInfo.h"
-#include "threadpool/MapProxy.h"
+#include "../RmgMap.h"
+#include "../CMapGenerator.h"
+#include "../Functions.h"
+#include "../../TerrainHandler.h"
+#include "../../CRandomGenerator.h"
+#include "../lib/mapping/CMapEditManager.h"
+#include "../TileInfo.h"
+#include "../threadpool/MapProxy.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

lib/rmg/modificators/RockFiller.h

@@ -9,7 +9,7 @@
  */
 
 #pragma once
-#include "Zone.h"
+#include "../Zone.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

lib/rmg/modificators/TerrainPainter.cpp

@@ -15,11 +15,11 @@
 #include "WaterProxy.h"
 #include "ConnectionsPlacer.h"
 #include "ObjectManager.h"
-#include "Functions.h"
-#include "CMapGenerator.h"
-#include "RmgMap.h"
-#include "../VCMI_Lib.h"
-#include "../TerrainHandler.h"
+#include "../Functions.h"
+#include "../CMapGenerator.h"
+#include "../RmgMap.h"
+#include "../../VCMI_Lib.h"
+#include "../../TerrainHandler.h"
 
 VCMI_LIB_NAMESPACE_BEGIN
 

lib/rmg/modificators/TerrainPainter.h

@@ -9,7 +9,7 @@
  */
 
 #pragma once
-#include "Zone.h"
+#include "../Zone.h"
 
 VCMI_LIB_NAMESPACE_BEGIN