Compile fixes, cleanup

lib/rmg/CMapGenOptions.cpp

@@ -10,7 +10,6 @@
  */
 
 #include "StdInc.h"
-#include "CMapGenOptions.h"
 
 #include "../mapping/CMapHeader.h"
 #include "CRmgTemplateStorage.h"

lib/rmg/CMapGenerator.cpp

@@ -80,13 +80,6 @@ void CMapGenerator::loadConfig()
 	config.pandoraMultiplierSpells = randomMapJson["pandoras"]["valueMultiplierSpells"].Integer();
 	config.pandoraSpellSchool = randomMapJson["pandoras"]["valueSpellSchool"].Integer();
 	config.pandoraSpell60 = randomMapJson["pandoras"]["valueSpell60"].Integer();
-	/*
-	//override config with game options
-	if(!mapGenOptions.isRoadEnabled(config.secondaryRoadType))
-		config.secondaryRoadType = "";
-	if(!mapGenOptions.isRoadEnabled(config.defaultRoadType))
-		config.defaultRoadType = config.secondaryRoadType;
-	*/
 	config.singleThread = randomMapJson["singleThread"].Bool();
 }
 

lib/rmg/modificators/ConnectionsPlacer.h

@@ -35,7 +35,6 @@ protected:
 	void collectNeighbourZones();
 
 protected:
-
 	std::vector<rmg::ZoneConnection> dConnections, dCompleted;
 	std::map<TRmgTemplateZoneId, rmg::Tileset> dNeighbourZones;
 };

lib/rmg/modificators/MinePlacer.cpp

@@ -65,7 +65,7 @@ bool MinePlacer::placeMines(ObjectManager & manager)
 
 			if (!i && (res == EGameResID::WOOD || res == EGameResID::ORE))
 			{
-				//only first wood&ore mines are close
+				//only first wood & ore mines are close
 				manager.addCloseObject(RequiredObjectInfo(mine, rmginfo.value));
 			}
 			else