Merge pull request mrkite#170 from madmaxoft/master

Fixed clang compile error and some warnings.
cre4ture · Aug 6, 2019 · e0c1b08 · e0c1b08
2 parents 7c35a2f + 4e0d42d
commit e0c1b08
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/chunk.cpp b/chunk.cpp
@@ -236,7 +236,7 @@ void Chunk::loadSection1519(ChunkSection *cs, const Tag *section) {
     for (int i = 0; i < 4096; i++) {
       cs->blocks[4095-i] = getBits(byteData, i*bitSize, bitSize);
     }
-    delete byteData;
+    delete[] byteData;
   } else {
     // set everything to 0 (minecraft:air)
     memset(cs->blocks, 0, sizeof(cs->blocks));

diff --git a/chunkrenderer.h b/chunkrenderer.h
@@ -17,7 +17,7 @@ class ChunkRenderer : public QObject, public QRunnable {
   void run();
 
  public:  // public to allow usage from WorldSave
-  void ChunkRenderer::renderChunk(Chunk *chunk);
+  void renderChunk(Chunk *chunk);
 
  signals:
   void rendered(int cx, int cz);

diff --git a/definitionmanager.cpp b/definitionmanager.cpp
@@ -23,12 +23,12 @@
 
 DefinitionManager::DefinitionManager(QWidget *parent) :
     QWidget(parent),
-    isUpdating(false),
-    dimensionManager(DimensionIdentifier::Instance()),
-    blockManager(BlockIdentifier::Instance()),
     biomeManager(BiomeIdentifier::Instance()),
+    blockManager(BlockIdentifier::Instance()),
+    dimensionManager(DimensionIdentifier::Instance()),
     entityManager(EntityIdentifier::Instance()),
-    flatteningConverter(FlatteningConverter::Instance())
+    flatteningConverter(FlatteningConverter::Instance()),
+    isUpdating(false)
 {
   setWindowFlags(Qt::Window);
   setWindowTitle(tr("Definitions"));