More rollback.

lib/CGameState.cpp

@@ -841,7 +841,7 @@ void CGameState::initNewGame()
 
 		// Gen map
 		CMapGenerator mapGenerator(scenarioOps->mapGenOptions, scenarioOps->seedToBeUsed);
-		map = mapGenerator.generate();
+		map = mapGenerator.generate().release();
 
 		// Update starting options
 		for(int i = 0; i < map->players.size(); ++i)

lib/rmg/CMapGenerator.cpp

@@ -24,11 +24,11 @@ CMapGenerator::~CMapGenerator()
 
 }
 
-ConstTransitivePtr<CMap> CMapGenerator::generate()
+std::unique_ptr<CMap> CMapGenerator::generate()
 {
 	mapGenOptions->finalize(rand);
 
-	//map = make_unique<CMap>();
+	map = make_unique<CMap>();
 	editManager = map->getEditManager();
 	editManager->getUndoManager().setUndoRedoLimit(0);
 	addHeaderInfo();

lib/rmg/CMapGenerator.h

@@ -36,10 +36,10 @@ public:
 	explicit CMapGenerator(shared_ptr<CMapGenOptions> mapGenOptions, int randomSeed = std::time(nullptr));
 	~CMapGenerator(); // required due to unique_ptr
 
-	ConstTransitivePtr<CMap> generate();
+	std::unique_ptr<CMap> generate();
 	
 	shared_ptr<CMapGenOptions> mapGenOptions;
-	ConstTransitivePtr<CMap> map;
+	std::unique_ptr<CMap> map;
 	CRandomGenerator rand;
 	int randomSeed;
 	CMapEditManager * editManager;