diff options
| author | Howaner <franzi.moos@googlemail.com> | 2014-09-19 17:33:22 +0200 |
|---|---|---|
| committer | Howaner <franzi.moos@googlemail.com> | 2014-09-19 17:33:22 +0200 |
| commit | 09ca7d144afaa4c3fb7727390d11a10c3a29d98e (patch) | |
| tree | 4dadccef8ed72f8954b8d079f901709b578f6171 /Tools/QtBiomeVisualiser | |
| parent | Created MobSpawnerEntity class. (diff) | |
| parent | QtBiomeVisualiser: More gcc fixes. (diff) | |
| download | cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar.gz cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar.bz2 cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar.lz cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar.xz cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.tar.zst cuberite-09ca7d144afaa4c3fb7727390d11a10c3a29d98e.zip | |
Diffstat (limited to 'Tools/QtBiomeVisualiser')
| -rw-r--r-- | Tools/QtBiomeVisualiser/BiomeView.h | 1 | ||||
| -rw-r--r-- | Tools/QtBiomeVisualiser/ChunkCache.h | 1 | ||||
| -rw-r--r-- | Tools/QtBiomeVisualiser/ChunkLoader.h | 2 | ||||
| -rw-r--r-- | Tools/QtBiomeVisualiser/ChunkSource.cpp | 4 | ||||
| -rw-r--r-- | Tools/QtBiomeVisualiser/ChunkSource.h | 1 | ||||
| -rw-r--r-- | Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro | 1 |
6 files changed, 8 insertions, 2 deletions
diff --git a/Tools/QtBiomeVisualiser/BiomeView.h b/Tools/QtBiomeVisualiser/BiomeView.h index 86af8bcaf..f0521571d 100644 --- a/Tools/QtBiomeVisualiser/BiomeView.h +++ b/Tools/QtBiomeVisualiser/BiomeView.h @@ -1,6 +1,7 @@ #pragma once #include <QWidget> +#include <memory> #include "ChunkCache.h" #include "ChunkSource.h" diff --git a/Tools/QtBiomeVisualiser/ChunkCache.h b/Tools/QtBiomeVisualiser/ChunkCache.h index 0134bc7af..8d198f02f 100644 --- a/Tools/QtBiomeVisualiser/ChunkCache.h +++ b/Tools/QtBiomeVisualiser/ChunkCache.h @@ -3,6 +3,7 @@ #include <QObject> #include <QCache> #include <QMutex> +#include <memory> diff --git a/Tools/QtBiomeVisualiser/ChunkLoader.h b/Tools/QtBiomeVisualiser/ChunkLoader.h index 3565434b9..4d026a45e 100644 --- a/Tools/QtBiomeVisualiser/ChunkLoader.h +++ b/Tools/QtBiomeVisualiser/ChunkLoader.h @@ -1,6 +1,8 @@ #pragma once + #include <QObject> #include <QRunnable> +#include <memory> diff --git a/Tools/QtBiomeVisualiser/ChunkSource.cpp b/Tools/QtBiomeVisualiser/ChunkSource.cpp index 9e0ea5751..2235816bc 100644 --- a/Tools/QtBiomeVisualiser/ChunkSource.cpp +++ b/Tools/QtBiomeVisualiser/ChunkSource.cpp @@ -120,8 +120,8 @@ static void biomesToImage(cChunkDef::BiomeMap & a_Biomes, Chunk::Image & a_Image { // Make sure the two arrays are of the same size, compile-time. // Note that a_Image is actually 4 items per pixel, so the array is 4 times bigger: - static const char Check1[4 * ARRAYCOUNT(a_Biomes) - ARRAYCOUNT(a_Image) + 1]; - static const char Check2[ARRAYCOUNT(a_Image) - 4 * ARRAYCOUNT(a_Biomes) + 1]; + static const char Check1[4 * ARRAYCOUNT(a_Biomes) - ARRAYCOUNT(a_Image) + 1] = {}; + static const char Check2[ARRAYCOUNT(a_Image) - 4 * ARRAYCOUNT(a_Biomes) + 1] = {}; // Convert the biomes into color: for (size_t i = 0; i < ARRAYCOUNT(a_Biomes); i++) diff --git a/Tools/QtBiomeVisualiser/ChunkSource.h b/Tools/QtBiomeVisualiser/ChunkSource.h index a485e473a..868e4a144 100644 --- a/Tools/QtBiomeVisualiser/ChunkSource.h +++ b/Tools/QtBiomeVisualiser/ChunkSource.h @@ -1,5 +1,6 @@ #pragma once #include <QString> +#include <QMutex> #include "Chunk.h" diff --git a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro index 0b42f076d..e6b65e628 100644 --- a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro +++ b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro @@ -55,5 +55,6 @@ INCLUDEPATH += $$_PRO_FILE_PWD_ \ $$_PRO_FILE_PWD_/../../lib +CONFIG += C++11 |