Merged branch 'master' into c++11.

2014-10-23 08:40:39 +02:00
parent 6a9f8a7615 4bfd2c9707
commit f8c54f4243
51 changed files with 820 additions and 527 deletions
@@ -119,9 +119,9 @@ cTerrainCompositionGenPtr cTerrainCompositionGen::CreateCompositionGen(cIniFile

 cComposableGenerator::cComposableGenerator(cChunkGenerator & a_ChunkGenerator) :
 	super(a_ChunkGenerator),
-	m_BiomeGen(nullptr),
-	m_HeightGen(nullptr),
-	m_CompositionGen(nullptr)
+	m_BiomeGen(),
+	m_HeightGen(),
+	m_CompositionGen()
 {
 }