Moved Modificators to separate folder

2025-01-12 02:28:11 +02:00 · 2023-05-20 10:17:37 +02:00 · 2023-05-20 10:17:37 +02:00 · cf0515dcd3
commit cf0515dcd3
parent 5f99facd8f
36 changed files with 181 additions and 181 deletions
--- a/cmake_modules/VCMI_lib.cmake
+++ b/cmake_modules/VCMI_lib.cmake
@ -122,24 +122,24 @@ macro(add_main_lib TARGET_NAME LIBRARY_TYPE)
 		${MAIN_LIB_DIR}/rmg/TileInfo.cpp
 		${MAIN_LIB_DIR}/rmg/Zone.cpp
 		${MAIN_LIB_DIR}/rmg/Functions.cpp
-		${MAIN_LIB_DIR}/rmg/Modificator.cpp
-		${MAIN_LIB_DIR}/rmg/ObjectManager.cpp
-		${MAIN_LIB_DIR}/rmg/ObjectDistributor.cpp
-		${MAIN_LIB_DIR}/rmg/RoadPlacer.cpp
-		${MAIN_LIB_DIR}/rmg/TreasurePlacer.cpp
-		${MAIN_LIB_DIR}/rmg/QuestArtifactPlacer.cpp
 		${MAIN_LIB_DIR}/rmg/RmgMap.cpp
-		${MAIN_LIB_DIR}/rmg/ConnectionsPlacer.cpp
-		${MAIN_LIB_DIR}/rmg/WaterAdopter.cpp
-		${MAIN_LIB_DIR}/rmg/MinePlacer.cpp
-		${MAIN_LIB_DIR}/rmg/TownPlacer.cpp
-		${MAIN_LIB_DIR}/rmg/WaterProxy.cpp
-		${MAIN_LIB_DIR}/rmg/WaterRoutes.cpp
-		${MAIN_LIB_DIR}/rmg/RockPlacer.cpp
-		${MAIN_LIB_DIR}/rmg/RockFiller.cpp
-		${MAIN_LIB_DIR}/rmg/ObstaclePlacer.cpp
-		${MAIN_LIB_DIR}/rmg/RiverPlacer.cpp
-		${MAIN_LIB_DIR}/rmg/TerrainPainter.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/Modificator.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/ObjectManager.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/ObjectDistributor.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/RoadPlacer.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/TreasurePlacer.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/QuestArtifactPlacer.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/ConnectionsPlacer.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/WaterAdopter.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/MinePlacer.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/TownPlacer.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/WaterProxy.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/WaterRoutes.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/RockPlacer.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/RockFiller.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/ObstaclePlacer.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/RiverPlacer.cpp
+		${MAIN_LIB_DIR}/rmg/modificators/TerrainPainter.cpp
 		${MAIN_LIB_DIR}/rmg/threadpool/MapProxy.cpp

 		${MAIN_LIB_DIR}/serializer/BinaryDeserializer.cpp
@ -410,26 +410,26 @@ macro(add_main_lib TARGET_NAME LIBRARY_TYPE)
 		${MAIN_LIB_DIR}/rmg/CZonePlacer.h
 		${MAIN_LIB_DIR}/rmg/TileInfo.h
 		${MAIN_LIB_DIR}/rmg/Zone.h
-		${MAIN_LIB_DIR}/rmg/Functions.h
-		${MAIN_LIB_DIR}/rmg/Modificator.h
-		${MAIN_LIB_DIR}/rmg/ObjectManager.h
-		${MAIN_LIB_DIR}/rmg/ObjectDistributor.h
-		${MAIN_LIB_DIR}/rmg/RoadPlacer.h
-		${MAIN_LIB_DIR}/rmg/TreasurePlacer.h
-		${MAIN_LIB_DIR}/rmg/QuestArtifactPlacer.h
 		${MAIN_LIB_DIR}/rmg/RmgMap.h
-		${MAIN_LIB_DIR}/rmg/ConnectionsPlacer.h
-		${MAIN_LIB_DIR}/rmg/WaterAdopter.h
-		${MAIN_LIB_DIR}/rmg/MinePlacer.h
-		${MAIN_LIB_DIR}/rmg/TownPlacer.h
-		${MAIN_LIB_DIR}/rmg/WaterProxy.h
-		${MAIN_LIB_DIR}/rmg/WaterRoutes.h
-		${MAIN_LIB_DIR}/rmg/RockPlacer.h
-		${MAIN_LIB_DIR}/rmg/RockFiller.h
-		${MAIN_LIB_DIR}/rmg/ObstaclePlacer.h
-		${MAIN_LIB_DIR}/rmg/RiverPlacer.h
-		${MAIN_LIB_DIR}/rmg/TerrainPainter.h
 		${MAIN_LIB_DIR}/rmg/float3.h
+		${MAIN_LIB_DIR}/rmg/Functions.h
+		${MAIN_LIB_DIR}/rmg/modificators/Modificator.h
+		${MAIN_LIB_DIR}/rmg/modificators/ObjectManager.h
+		${MAIN_LIB_DIR}/rmg/modificators/ObjectDistributor.h
+		${MAIN_LIB_DIR}/rmg/modificators/RoadPlacer.h
+		${MAIN_LIB_DIR}/rmg/modificators/TreasurePlacer.h
+		${MAIN_LIB_DIR}/rmg/modificators/QuestArtifactPlacer.h
+		${MAIN_LIB_DIR}/rmg/modificators/ConnectionsPlacer.h
+		${MAIN_LIB_DIR}/rmg/modificators/WaterAdopter.h
+		${MAIN_LIB_DIR}/rmg/modificators/MinePlacer.h
+		${MAIN_LIB_DIR}/rmg/modificators/TownPlacer.h
+		${MAIN_LIB_DIR}/rmg/modificators/WaterProxy.h
+		${MAIN_LIB_DIR}/rmg/modificators/WaterRoutes.h
+		${MAIN_LIB_DIR}/rmg/modificators/RockPlacer.h
+		${MAIN_LIB_DIR}/rmg/modificators/RockFiller.h
+		${MAIN_LIB_DIR}/rmg/modificators/ObstaclePlacer.h
+		${MAIN_LIB_DIR}/rmg/modificators/RiverPlacer.h
+		${MAIN_LIB_DIR}/rmg/modificators/TerrainPainter.h
 		${MAIN_LIB_DIR}/rmg/threadpool/BlockingQueue.h
 		${MAIN_LIB_DIR}/rmg/threadpool/ThreadPool.h
 		${MAIN_LIB_DIR}/rmg/threadpool/MapProxy.h
--- a/lib/rmg/modificators/ConnectionsPlacer.cpp
+++ b/lib/rmg/modificators/ConnectionsPlacer.cpp
@ -10,18 +10,18 @@

 #include "StdInc.h"
 #include "ConnectionsPlacer.h"
-#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 "../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"
+#include "../Functions.h"
 #include "RoadPlacer.h"
-#include "TileInfo.h"
+#include "../TileInfo.h"
 #include "WaterAdopter.h"
 #include "WaterProxy.h"
 #include "TownPlacer.h"
--- a/lib/rmg/modificators/ConnectionsPlacer.h
+++ b/lib/rmg/modificators/ConnectionsPlacer.h
@ -9,8 +9,8 @@
 */

 #pragma once
-#include "Zone.h"
-#include "RmgArea.h"
+#include "../Zone.h"
+#include "../RmgArea.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/MinePlacer.cpp
+++ b/lib/rmg/modificators/MinePlacer.cpp
@ -8,19 +8,19 @@
 #include "MinePlacer.h"
 #include "TownPlacer.h"
 #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 "../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"
-#include "Functions.h"
+#include "../Functions.h"
 #include "RoadPlacer.h"
 #include "WaterAdopter.h"
-#include "TileInfo.h"
+#include "../TileInfo.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/MinePlacer.h
+++ b/lib/rmg/modificators/MinePlacer.h
@ -8,7 +8,7 @@
 *
 */
 #pragma once
-#include "Zone.h"
+#include "../Zone.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/Modificator.cpp
+++ b/lib/rmg/modificators/Modificator.cpp
@ -9,11 +9,11 @@
 */

 #include "Modificator.h"
-#include "Functions.h"
-#include "CMapGenerator.h"
-#include "RmgMap.h"
-#include "../CStopWatch.h"
-#include "../mapping/CMap.h"
+#include "../Functions.h"
+#include "../CMapGenerator.h"
+#include "../RmgMap.h"
+#include "../../CStopWatch.h"
+#include "../../mapping/CMap.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/Modificator.h
+++ b/lib/rmg/modificators/Modificator.h
@ -10,10 +10,10 @@

 #pragma once

-#include "../GameConstants.h"
-#include "../int3.h"
-#include "Zone.h"
-#include "threadpool/MapProxy.h"
+#include "../../GameConstants.h"
+#include "../../int3.h"
+#include "../Zone.h"
+#include "../threadpool/MapProxy.h"

 class RmgMap;
 class CMapGenerator;
--- a/lib/rmg/modificators/ObjectDistributor.cpp
+++ b/lib/rmg/modificators/ObjectDistributor.cpp
--- a/lib/rmg/modificators/ObjectDistributor.h
+++ b/lib/rmg/modificators/ObjectDistributor.h
--- a/lib/rmg/modificators/ObjectManager.cpp
+++ b/lib/rmg/modificators/ObjectManager.cpp
@ -10,9 +10,9 @@

 #include "StdInc.h"
 #include "ObjectManager.h"
-#include "CMapGenerator.h"
-#include "TileInfo.h"
-#include "RmgMap.h"
+#include "../CMapGenerator.h"
+#include "../TileInfo.h"
+#include "../RmgMap.h"
 #include "RoadPlacer.h"
 #include "RiverPlacer.h"
 #include "WaterAdopter.h"
@ -21,13 +21,13 @@
 #include "MinePlacer.h"
 #include "TreasurePlacer.h"
 #include "QuestArtifactPlacer.h"
-#include "../CCreatureHandler.h"
-#include "../mapObjects/CommonConstructors.h"
-#include "../mapObjects/MapObjects.h" //needed to resolve templates for CommonConstructors.h
-#include "../mapping/CMap.h"
-#include "../mapping/CMapEditManager.h"
-#include "Functions.h"
-#include "RmgObject.h"
+#include "../../CCreatureHandler.h"
+#include "../../mapObjects/CommonConstructors.h"
+#include "../../mapObjects/MapObjects.h" //needed to resolve templates for CommonConstructors.h
+#include "../../mapping/CMap.h"
+#include "../../mapping/CMapEditManager.h"
+#include "../Functions.h"
+#include "../RmgObject.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/ObjectManager.h
+++ b/lib/rmg/modificators/ObjectManager.h
@ -10,8 +10,8 @@

 #pragma once

-#include "Zone.h"
-#include "RmgObject.h"
+#include "../Zone.h"
+#include "../RmgObject.h"
 #include <boost/heap/priority_queue.hpp> //A*

 VCMI_LIB_NAMESPACE_BEGIN
--- a/lib/rmg/modificators/ObstaclePlacer.cpp
+++ b/lib/rmg/modificators/ObstaclePlacer.cpp
@ -17,13 +17,13 @@
 #include "WaterProxy.h"
 #include "RoadPlacer.h"
 #include "RiverPlacer.h"
-#include "RmgMap.h"
-#include "CMapGenerator.h"
-#include "../CRandomGenerator.h"
-#include "Functions.h"
-#include "../mapping/CMapEditManager.h"
-#include "../mapping/CMap.h"
-#include "../mapping/ObstacleProxy.h"
+#include "../RmgMap.h"
+#include "../CMapGenerator.h"
+#include "../../CRandomGenerator.h"
+#include "../Functions.h"
+#include "../../mapping/CMapEditManager.h"
+#include "../../mapping/CMap.h"
+#include "../../mapping/ObstacleProxy.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/ObstaclePlacer.h
+++ b/lib/rmg/modificators/ObstaclePlacer.h
@ -11,7 +11,7 @@
 #pragma once

 #include "Modificator.h"
-#include "../mapping/ObstacleProxy.h"
+#include "../../mapping/ObstacleProxy.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/QuestArtifactPlacer.cpp
+++ b/lib/rmg/modificators/QuestArtifactPlacer.cpp
@ -11,14 +11,14 @@

 #include "StdInc.h"
 #include "QuestArtifactPlacer.h"
-#include "CMapGenerator.h"
-#include "RmgMap.h"
+#include "../CMapGenerator.h"
+#include "../RmgMap.h"
 #include "TreasurePlacer.h"
-#include "CZonePlacer.h"
-#include "../VCMI_Lib.h"
-#include "../mapObjects/CObjectHandler.h"
-#include "../mapObjects/CommonConstructors.h"
-#include "../mapObjects/MapObjects.h" 
+#include "../CZonePlacer.h"
+#include "../../VCMI_Lib.h"
+#include "../../mapObjects/CObjectHandler.h"
+#include "../../mapObjects/CommonConstructors.h"
+#include "../../mapObjects/MapObjects.h" 

 void QuestArtifactPlacer::process()
 {
--- a/lib/rmg/modificators/QuestArtifactPlacer.h
+++ b/lib/rmg/modificators/QuestArtifactPlacer.h
@ -9,9 +9,9 @@
 */

 #pragma once
-#include "Zone.h"
-#include "Functions.h"
-#include "../mapObjects/ObjectTemplate.h"
+#include "../Zone.h"
+#include "../Functions.h"
+#include "../../mapObjects/ObjectTemplate.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/RiverPlacer.cpp
+++ b/lib/rmg/modificators/RiverPlacer.cpp
@ -10,15 +10,15 @@

 #include "StdInc.h"
 #include "RiverPlacer.h"
-#include "Functions.h"
-#include "CMapGenerator.h"
-#include "RmgMap.h"
-#include "../RiverHandler.h"
-#include "../TerrainHandler.h"
-#include "../mapping/CMap.h"
-#include "../mapping/CMapEditManager.h"
-#include "../mapObjects/CObjectClassesHandler.h"
-#include "RmgPath.h"
+#include "../Functions.h"
+#include "../CMapGenerator.h"
+#include "../RmgMap.h"
+#include "../../RiverHandler.h"
+#include "../../TerrainHandler.h"
+#include "../../mapping/CMap.h"
+#include "../../mapping/CMapEditManager.h"
+#include "../../mapObjects/CObjectClassesHandler.h"
+#include "../RmgPath.h"
 #include "ObjectManager.h"
 #include "ObstaclePlacer.h"
 #include "WaterProxy.h"
--- a/lib/rmg/modificators/RiverPlacer.h
+++ b/lib/rmg/modificators/RiverPlacer.h
@ -9,7 +9,7 @@
 */

 #pragma once
-#include "Zone.h"
+#include "../Zone.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/RoadPlacer.cpp
+++ b/lib/rmg/modificators/RoadPlacer.cpp
@ -12,13 +12,13 @@
 #include "RoadPlacer.h"
 #include "ObjectManager.h"
 #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 "../Functions.h"
+#include "../CMapGenerator.h"
+#include "../RmgMap.h"
+#include "../threadpool/MapProxy.h"
+#include "../../mapping/CMapEditManager.h"
+#include "../../CModHandler.h"
+#include "../RmgPath.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/RoadPlacer.h
+++ b/lib/rmg/modificators/RoadPlacer.h
@ -9,7 +9,7 @@
 */

 #pragma once
-#include "Zone.h"
+#include "../Zone.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/RockFiller.cpp
+++ b/lib/rmg/modificators/RockFiller.cpp
--- a/lib/rmg/modificators/RockFiller.h
+++ b/lib/rmg/modificators/RockFiller.h
--- a/lib/rmg/modificators/RockPlacer.cpp
+++ b/lib/rmg/modificators/RockPlacer.cpp
@ -14,13 +14,13 @@
 #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 "../RmgMap.h"
+#include "../CMapGenerator.h"
+#include "../Functions.h"
+#include "../../TerrainHandler.h"
+#include "../../CRandomGenerator.h"
+#include "../../mapping/CMapEditManager.h"
+#include "../TileInfo.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/RockPlacer.h
+++ b/lib/rmg/modificators/RockPlacer.h
@ -9,7 +9,7 @@
 */

 #pragma once
-#include "Zone.h"
+#include "../Zone.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/TerrainPainter.cpp
+++ b/lib/rmg/modificators/TerrainPainter.cpp
--- a/lib/rmg/modificators/TerrainPainter.h
+++ b/lib/rmg/modificators/TerrainPainter.h
--- a/lib/rmg/modificators/TownPlacer.cpp
+++ b/lib/rmg/modificators/TownPlacer.cpp
@ -10,20 +10,20 @@

 #include "StdInc.h"
 #include "TownPlacer.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 "../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"
-#include "Functions.h"
+#include "../Functions.h"
 #include "RoadPlacer.h"
 #include "MinePlacer.h"
 #include "WaterAdopter.h"
-#include "TileInfo.h"
+#include "../TileInfo.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/TownPlacer.h
+++ b/lib/rmg/modificators/TownPlacer.h
@ -8,7 +8,7 @@
 *
 */
 #pragma once
-#include "Zone.h"
+#include "../Zone.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/TreasurePlacer.cpp
+++ b/lib/rmg/modificators/TreasurePlacer.cpp
@ -10,21 +10,21 @@

 #include "StdInc.h"
 #include "TreasurePlacer.h"
-#include "CMapGenerator.h"
-#include "Functions.h"
+#include "../CMapGenerator.h"
+#include "../Functions.h"
 #include "ObjectManager.h"
 #include "RoadPlacer.h"
 #include "ConnectionsPlacer.h"
-#include "RmgMap.h"
-#include "TileInfo.h"
-#include "CZonePlacer.h"
+#include "../RmgMap.h"
+#include "../TileInfo.h"
+#include "../CZonePlacer.h"
 #include "QuestArtifactPlacer.h"
-#include "../mapObjects/CommonConstructors.h"
-#include "../mapObjects/MapObjects.h" //needed to resolve templates for CommonConstructors.h
-#include "../CCreatureHandler.h"
-#include "../spells/CSpellHandler.h" //for choosing random spells
-#include "../mapping/CMap.h"
-#include "../mapping/CMapEditManager.h"
+#include "../../mapObjects/CommonConstructors.h"
+#include "../../mapObjects/MapObjects.h" //needed to resolve templates for CommonConstructors.h
+#include "../../CCreatureHandler.h"
+#include "../../spells/CSpellHandler.h" //for choosing random spells
+#include "../../mapping/CMap.h"
+#include "../../mapping/CMapEditManager.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/TreasurePlacer.h
+++ b/lib/rmg/modificators/TreasurePlacer.h
@ -9,8 +9,8 @@
 */

 #pragma once
-#include "Zone.h"
-#include "../mapObjects/ObjectTemplate.h"
+#include "../Zone.h"
+#include "../../mapObjects/ObjectTemplate.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/WaterAdopter.cpp
+++ b/lib/rmg/modificators/WaterAdopter.cpp
@ -10,20 +10,20 @@

 #include "StdInc.h"
 #include "WaterAdopter.h"
-#include "CMapGenerator.h"
-#include "RmgMap.h"
-#include "../mapping/CMap.h"
-#include "../mapping/CMapEditManager.h"
-#include "../mapObjects/CObjectClassesHandler.h"
-#include "RmgPath.h"
-#include "RmgObject.h"
+#include "../CMapGenerator.h"
+#include "../RmgMap.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"
+#include "../Functions.h"
 #include "RoadPlacer.h"
 #include "TreasurePlacer.h"
 #include "TownPlacer.h"
 #include "ConnectionsPlacer.h"
-#include "TileInfo.h"
+#include "../TileInfo.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/WaterAdopter.h
+++ b/lib/rmg/modificators/WaterAdopter.h
@ -9,7 +9,7 @@
 */

 #pragma once
-#include "Zone.h"
+#include "../Zone.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/WaterProxy.cpp
+++ b/lib/rmg/modificators/WaterProxy.cpp
@ -10,23 +10,23 @@

 #include "StdInc.h"
 #include "WaterProxy.h"
-#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 "../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"
+#include "../Functions.h"
 #include "RoadPlacer.h"
 #include "TreasurePlacer.h"
 #include "TownPlacer.h"
 #include "ConnectionsPlacer.h"
-#include "TileInfo.h"
+#include "../TileInfo.h"
 #include "WaterAdopter.h"
-#include "RmgArea.h"
+#include "../RmgArea.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/WaterProxy.h
+++ b/lib/rmg/modificators/WaterProxy.h
@ -9,7 +9,7 @@
 */

 #pragma once
-#include "Zone.h"
+#include "../Zone.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/WaterRoutes.cpp
+++ b/lib/rmg/modificators/WaterRoutes.cpp
@ -11,22 +11,22 @@
 #include "StdInc.h"
 #include "WaterRoutes.h"
 #include "WaterProxy.h"
-#include "CMapGenerator.h"
-#include "RmgMap.h"
-#include "../mapping/CMap.h"
-#include "../mapping/CMapEditManager.h"
-#include "../mapObjects/CObjectClassesHandler.h"
-#include "RmgPath.h"
-#include "RmgObject.h"
+#include "../CMapGenerator.h"
+#include "../RmgMap.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"
+#include "../Functions.h"
 #include "RoadPlacer.h"
 #include "TreasurePlacer.h"
 #include "TownPlacer.h"
 #include "ConnectionsPlacer.h"
-#include "TileInfo.h"
+#include "../TileInfo.h"
 #include "WaterAdopter.h"
-#include "RmgArea.h"
+#include "../RmgArea.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/lib/rmg/modificators/WaterRoutes.h
+++ b/lib/rmg/modificators/WaterRoutes.h
@ -9,7 +9,7 @@
 */

 #pragma once
-#include "Zone.h"
+#include "../Zone.h"

 VCMI_LIB_NAMESPACE_BEGIN

--- a/mapeditor/mapcontroller.cpp
+++ b/mapeditor/mapcontroller.cpp
@ -16,7 +16,7 @@
 #include "../lib/mapping/CMapEditManager.h"
 #include "../lib/TerrainHandler.h"
 #include "../lib/mapObjects/CObjectClassesHandler.h"
-#include "../lib/rmg/ObstaclePlacer.h"
+#include "../lib/rmg/modificators/ObstaclePlacer.h"
 #include "../lib/CSkillHandler.h"
 #include "../lib/spells/CSpellHandler.h"
 #include "../lib/CHeroHandler.h"