From e0cfbc4d8526a1a1d3afa8fc0774358f4f18b7e2 Mon Sep 17 00:00:00 2001 From: Mattes D Date: Sun, 19 Oct 2014 14:01:59 +0200 Subject: Generator: Rewritten to use SharedPtrs. --- Tools/QtBiomeVisualiser/ChunkSource.cpp | 2 +- Tools/QtBiomeVisualiser/ChunkSource.h | 2 +- Tools/QtBiomeVisualiser/GeneratorSetup.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'Tools') diff --git a/Tools/QtBiomeVisualiser/ChunkSource.cpp b/Tools/QtBiomeVisualiser/ChunkSource.cpp index e5cd7a75a..3e5216458 100644 --- a/Tools/QtBiomeVisualiser/ChunkSource.cpp +++ b/Tools/QtBiomeVisualiser/ChunkSource.cpp @@ -43,7 +43,7 @@ void BioGenSource::reload() int seed = m_IniFile->GetValueSetI("Seed", "Seed", 0); bool unused = false; QMutexLocker lock(&m_Mtx); - m_BiomeGen.reset(cBiomeGen::CreateBiomeGen(*m_IniFile, seed, unused)); + m_BiomeGen = cBiomeGen::CreateBiomeGen(*m_IniFile, seed, unused); } diff --git a/Tools/QtBiomeVisualiser/ChunkSource.h b/Tools/QtBiomeVisualiser/ChunkSource.h index 7bd1865ff..5332c5d3f 100644 --- a/Tools/QtBiomeVisualiser/ChunkSource.h +++ b/Tools/QtBiomeVisualiser/ChunkSource.h @@ -53,7 +53,7 @@ protected: cIniFilePtr m_IniFile; /** The generator used for generating biomes. */ - std::unique_ptr m_BiomeGen; + cBiomeGenPtr m_BiomeGen; /** Guards m_BiomeGen against multithreaded access. */ QMutex m_Mtx; diff --git a/Tools/QtBiomeVisualiser/GeneratorSetup.cpp b/Tools/QtBiomeVisualiser/GeneratorSetup.cpp index d6348ee00..7d94a1682 100644 --- a/Tools/QtBiomeVisualiser/GeneratorSetup.cpp +++ b/Tools/QtBiomeVisualiser/GeneratorSetup.cpp @@ -59,7 +59,7 @@ GeneratorSetup::GeneratorSetup(const AString & a_IniFileName, QWidget * a_Parent m_IniFile->SetValue("Generator", "Generator", "Composable"); m_IniFile->SetValue("Generator", "BiomeGen", m_cbGenerator->currentText().toStdString()); bool dummy; - delete cBiomeGen::CreateBiomeGen(*m_IniFile, 0, dummy); + cBiomeGen::CreateBiomeGen(*m_IniFile, 0, dummy); } updateFromIni(); @@ -91,7 +91,7 @@ void GeneratorSetup::generatorChanged(const QString & a_NewName) // Create a dummy biome gen from the INI file, this will create the defaults in the INI file: bool dummy; - delete cBiomeGen::CreateBiomeGen(*m_IniFile, m_Seed, dummy); + cBiomeGen::CreateBiomeGen(*m_IniFile, m_Seed, dummy); // Read all values from the INI file and put them into the form layout: updateFromIni(); -- cgit v1.2.3