Merge branch 'master' into WorldLoader

Tools/QtBiomeVisualiser/BiomeView.cpp

@@ -1,6 +1,6 @@
 #include "Globals.h"
 #include "BiomeView.h"
-#include "Chunk.h"
+#include "QtChunk.h"
 #include <QPainter>
 #include <QResizeEvent>
 

Tools/QtBiomeVisualiser/ChunkSource.cpp

@@ -2,9 +2,9 @@
 #include "ChunkSource.h"
 #include <QThread>
 #include "src/Generating/BioGen.h"
-#include "inifile/iniFile.h"
 #include "src/StringCompression.h"
 #include "src/WorldStorage/FastNBT.h"
+#include "inifile/iniFile.h"
 
 
 

Tools/QtBiomeVisualiser/ChunkSource.h

@@ -2,7 +2,7 @@
 #include "Globals.h"
 #include <QString>
 #include <QMutex>
-#include "Chunk.h"
+#include "QtChunk.h"
 
 
 

Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro

@@ -12,7 +12,7 @@ TARGET = QtBiomeVisualiser
 TEMPLATE = app
 
 
-SOURCES += main.cpp\
+SOURCES +=\
 		MainWindow.cpp \
     BiomeView.cpp \
     ../../src/Generating/BioGen.cpp \
@@ -27,7 +27,6 @@ SOURCES += main.cpp\
     ../../src/OSSupport/IsThread.cpp \
     ../../src/BiomeDef.cpp \
     ChunkCache.cpp \
-    Chunk.cpp \
     ChunkSource.cpp \
     ChunkLoader.cpp \
     ../../src/StringCompression.cpp \
@@ -47,7 +46,9 @@ SOURCES += main.cpp\
     ../../lib/zlib/trees.c \
     ../../lib/zlib/uncompr.c \
     ../../lib/zlib/zutil.c \
-    GeneratorSetup.cpp
+    GeneratorSetup.cpp \
+    QtBiomeVisualiser.cpp \
+    QtChunk.cpp
 
 HEADERS  += MainWindow.h \
 		Globals.h \
@@ -64,7 +65,6 @@ HEADERS  += MainWindow.h \
     ../../src/OSSupport/IsThread.h \
     ../../src/BiomeDef.h \
     ChunkCache.h \
-    Chunk.h \
     ChunkSource.h \
     ChunkLoader.h \
     ../../src/StringCompression.h \
@@ -80,13 +80,19 @@ HEADERS  += MainWindow.h \
     ../../lib/zlib/zconf.h \
     ../../lib/zlib/zlib.h \
     ../../lib/zlib/zutil.h \
-    GeneratorSetup.h
+    GeneratorSetup.h \
+    QtChunk.h
 
 INCLUDEPATH += $$_PRO_FILE_PWD_ \
 	$$_PRO_FILE_PWD_/../../lib \
+	$$_PRO_FILE_PWD_/../../lib/jsoncpp/include \
+	$$_PRO_FILE_PWD_/../../lib/polarssl/include \
+	$$_PRO_FILE_PWD_/../../lib/sqlite \
+	$$_PRO_FILE_PWD_/../../lib/SQLiteCpp/include \
 	$$_PRO_FILE_PWD_/../../
 
 
+
 CONFIG += C++11
 
 OTHER_FILES +=

Tools/QtBiomeVisualiser/QtChunk.cpp

@@ -1,6 +1,5 @@
 #include "Globals.h"
-#include "Globals.h"
-#include "Chunk.h"
+#include "QtChunk.h"
 
 
 

src/WorldStorage/NBTChunkSerializer.cpp

@@ -582,7 +582,7 @@ void cNBTChunkSerializer::AddMonsterEntity(cMonster * a_Monster)
 				}
 				m_Writer.AddByte("Sitting",     Wolf.IsSitting() ? 1 : 0);
 				m_Writer.AddByte("Angry",       Wolf.IsAngry() ? 1 : 0);
-				m_Writer.AddInt("CollarColor",  Wolf.GetCollarColor());
+				m_Writer.AddByte("CollarColor", (unsigned char)Wolf.GetCollarColor());
 				break;
 			}
 			case cMonster::mtZombie:

src/WorldStorage/WSSAnvil.cpp

@@ -2505,10 +2505,24 @@ void cWSSAnvil::LoadWolfFromNBT(cEntityList & a_Entities, const cParsedNBT & a_N
 		Monster->SetIsAngry(Angry);
 	}
 	int CollarColorIdx = a_NBT.FindChildByName(a_TagIdx, "CollarColor");
-	if ((CollarColorIdx > 0) && (a_NBT.GetType(CollarColorIdx) == TAG_Int))
+	if (CollarColorIdx > 0)
 	{
-		int CollarColor = a_NBT.GetInt(CollarColorIdx);
+		switch (a_NBT.GetType(CollarColorIdx))
+		{
+			case TAG_Byte:
+			{
+				// Vanilla uses this
+				unsigned char CollarColor = a_NBT.GetByte(CollarColorIdx);
 				Monster->SetCollarColor(CollarColor);
+				break;
+			}
+			case TAG_Int:
+			{
+				// Old MCS code used this, keep reading it for compatibility reasons:
+				Monster->SetCollarColor(a_NBT.GetInt(CollarColorIdx));
+				break;
+			}
+		}
 	}
 	a_Entities.push_back(Monster.release());
 }