From 0b16bbfc012b51ce13f56562e8e3a4d2dcd1e678 Mon Sep 17 00:00:00 2001
From: Masy98 <masy@antheruscraft.de>
Date: Sun, 14 Sep 2014 17:58:09 +0200
Subject: [PATCH 01/28] Added me to the contributors list

---
 CONTRIBUTORS | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 925e8f35b..2d911a11d 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -29,5 +29,6 @@ worktycho
 xoft
 Yeeeeezus (Donated AlchemistVillage prefabs)
 Howaner
+Masy98
 
 Please add yourself to this list if you contribute to MCServer.

From 46061ab9173b37474ce850be6556899831083620 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Sun, 14 Sep 2014 19:59:58 +0200
Subject: [PATCH 02/28] Removed the unused nightbuild script.

---
 Nightbuild2008.cmd | 209 ---------------------------------------------
 1 file changed, 209 deletions(-)
 delete mode 100644 Nightbuild2008.cmd

diff --git a/Nightbuild2008.cmd b/Nightbuild2008.cmd
deleted file mode 100644
index bbaea0fb7..000000000
--- a/Nightbuild2008.cmd
+++ /dev/null
@@ -1,209 +0,0 @@
-@echo off
-:: Nightbbuild2008.cmd
-:: This script is run every night to produce a new version of MCServer, backup its PDB files and upload the packages to web.
-:: When run without parameters, this script pauses at the end and waits for a keypress.
-:: To run in an automated scheduler, add any parameter to disable waiting for a keystroke
-::
-:: The sript creates a symbol store (a database of PDB files) that can be used as a single entry in MSVC's symbol path,
-:: then any executable / crashdump built by this script can be debugged and its symbols will be found automatically by MSVC,
-:: without the users needing to specify the build version or anything.
-:: In order to support pruning the symstore, a per-month store is created, so that old months can be removed when no longer needed.
-::
-:: This script expects a few tools on specific paths, you can pass the correct paths for your system as env vars "zip" and "vc"
-:: This script assumes that "git", "symstore" and "touch" are available on PATH.
-:: git comes from msysgit
-:: symstore comes from Microsoft's Debugging Tools for Windows
-:: touch comes from unxtools
-:: This script is locale-dependent, because it parses the output of "time" and "date" shell commands
-
-
-:: 7-zip executable (by default it should be on PATH):
-if %zip%a == a set zip=7z
-
-:: Visual C++ compiler executable name:
-if %vc%a == a set vc="vcbuild.exe"
-
-
-
-
-:: Check that the required environment vars are available:
-if "a%ftppass%" == "a" (
-	echo You need to set FTP password in the ftppass environment variable to upload the files
-	goto haderror
-)
-if "a%ftpuser%" == "a" (
-	echo You need to set FTP username in the ftpuser environment variable to upload the files
-	goto haderror
-)
-if "a%ftpsite%" == "a" (
-	echo You need to set FTP server in the ftpsite environment variable to upload the files
-	goto haderror
-)
-
-
-
-
-:: Get the date and time into vars:
-:: This is locale-dependent!
-For /f "tokens=2-4 delims=/. " %%a in ('date /t') do (
-	set MYYEAR=%%c
-	set MYMONTH=%%b
-	set MYDAY=%%a
-)
-For /f "tokens=1-2 delims=/:" %%a in ('time /t') do (set MYTIME=%%a_%%b)
-
-echo Performing nightbuild of MC-Server
-
-
-
-
-
-set DONOTPAUSE=y
-
-:: Update the sources to the latest revision:
-git pull
-if errorlevel 1 goto haderror
-
-
-
-:: Update the external plugins to the latest revision:
-git submodule update
-if errorlevel 1 goto haderror
-
-
-
-
-:: Get the Git commit ID into an environment var
-For /f "tokens=1 delims=/. " %%a in ('git log -1 --oneline --no-abbrev-commit') do (set COMMITID=%%a)
-if errorlevel 1 goto haderror
-
-
-
-:: Test if the version is already present, using a "tagfile" that we create upon successful build
-set TAGFOLDER=Install\%MYYEAR%_%MYMONTH%\
-set TAGFILE=%TAGFOLDER%built_%COMMITID%.tag
-echo Tag file: %TAGFILE%
-if exist %TAGFILE% (
-	echo Latest version already present, bailing out
-	goto end
-)
-
-
-
-
-
-:: Configure the sources to use the MSVC2008 compiler:
-cmake -G "Visual Studio 9 2008" .
-if errorlevel 1 goto haderror
-
-
-
-
-
-:: Update the Bindings:
-echo Updating Lua bindings
-del src\Bindings\Bindings.cpp
-del src\Bindings\Bindings.h
-set ALLTOLUA_WAIT=N
-cd src\Bindings
-call AllToLua.bat
-cd ..\..
-
-
-
-
-:: Compile using VC2008 Express. Do a full rebuild.
-echo Setting up VS environment...
-call "%VS90COMNTOOLS%\vsvars32.bat"
-echo Compiling MCServer...
-title MCS Nightbuild
-start "vc" /b /wait /low /min %vc% /r MCServer.sln "Release|Win32"
-if errorlevel 1 goto haderror
-
-
-
-
-:: Generate the .example.ini files by running the server without any ini files:
-cd MCServer
-del groups.ini
-del settings.ini
-del webadmin.ini
-echo stop | MCServer
-cd ..
-
-
-
-:: Copy all the example ini files into the Install folder for zipping:
-copy MCServer\groups.ini Install\groups.example.ini
-copy MCServer\settings.ini Install\settings.example.ini
-copy MCServer\webadmin.ini Install\webadmin.example.ini
-
-
-
-
-:: Use 7-zip to compress the resulting files into a single file:
-set FILESUFFIX=%MYYEAR%_%MYMONTH%_%MYDAY%_%MYTIME%_%COMMITID%
-echo FILESUFFIX=%FILESUFFIX%
-copy MCServer\MCServer.exe Install\MCServer.exe
-cd Install
-%zip% a -mx9 -y MCServer_Win_%FILESUFFIX%.7z -scsWIN -i@Zip2008.list -xr!*.git*
-if errorlevel 1 goto haderror
-cd ..
-
-:: Also pack PDBs into a separate archive:
-%zip% a -mx9 -y Install\PDBs_%FILESUFFIX%.7z -scsWIN @Install\Zip2008_PDBs.list
-if errorlevel 1 goto haderror
-
-
-
-
-
-:: upload to the FTP:
-:upload
-ncftpput -p %ftppass% -u %ftpuser% -T temp_ %ftpsite% / Install\MCServer_Win_%FILESUFFIX%.7z
-if errorlevel 1 goto haderror
-ncftpput -p %ftppass% -u %ftpuser% -T temp_ %ftpsite% /PDBs Install\PDBs_%FILESUFFIX%.7z
-if errorlevel 1 goto haderror
-echo Upload finished.
-
-
-
-
-:: Create the tagfile so that we know that this CommitID has been built already
-mkdir %TAGFOLDER%
-touch %TAGFILE%
-
-
-
-
-
-:: Add the symbols to a global symbol cache
-:: We want per-month symbol caches, so that the old ones can be easily deleted
-set SYMBOLS=Symbols\%MYYEAR%_%MYMONTH%\
-echo Storing symbols in %SYMBOLS%
-
-symstore add /f MCServer\MCServer.* /s %SYMBOLS% /t MCServer
-if errorlevel 1 goto haderror
-
-
-
-goto end
-
-
-
-
-:haderror
-echo an error was encountered, check command output above
-pause
-goto finished
-
-
-
-
-
-:end
-if "a%1" == "a" pause
-
-
-
-:finished
\ No newline at end of file

From 2a020e47f1c9167b933fab2662c827365d2f6b5d Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 14 Sep 2014 20:09:11 +0200
Subject: [PATCH 03/28] QtBiomeVisualiser: Removed build-specific variables.

These should be set in the project configuration instead, passed directly to qmake.
---
 Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
index 0329d5607..0b42f076d 100644
--- a/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
+++ b/Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro
@@ -55,8 +55,5 @@ INCLUDEPATH += $$_PRO_FILE_PWD_ \
 	$$_PRO_FILE_PWD_/../../lib
 
 
-CONFIG += STATIC
-
-
 
 

From 69b46aeb27ecfbf87fec5945993a9a441cb89fc7 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 14 Sep 2014 22:05:10 +0200
Subject: [PATCH 04/28] QtBiomeVisualiser: Added mouse and keyboard view
 control.

Mouse dragging or WASD pans view, mouse wheel or QE zooms.
---
 Tools/QtBiomeVisualiser/BiomeView.cpp | 115 +++++++++++++++++++++++++-
 Tools/QtBiomeVisualiser/BiomeView.h   |  28 ++++++-
 2 files changed, 138 insertions(+), 5 deletions(-)

diff --git a/Tools/QtBiomeVisualiser/BiomeView.cpp b/Tools/QtBiomeVisualiser/BiomeView.cpp
index be01fd104..3d24ed126 100644
--- a/Tools/QtBiomeVisualiser/BiomeView.cpp
+++ b/Tools/QtBiomeVisualiser/BiomeView.cpp
@@ -33,6 +33,9 @@ BiomeView::BiomeView(QWidget * parent) :
 
 	// Add a chunk-update callback mechanism:
 	connect(&m_Cache, SIGNAL(chunkAvailable(int, int)), this, SLOT(chunkAvailable(int, int)));
+
+	// Allow keyboard interaction:
+	setFocusPolicy(Qt::StrongFocus);
 }
 
 
@@ -236,9 +239,117 @@ void BiomeView::paintEvent(QPaintEvent * a_Event)
 
 
 
-void BiomeView::queueChunkRender(ChunkPtr a_Chunk)
+void BiomeView::mousePressEvent(QMouseEvent * a_Event)
 {
-
+	m_LastX = a_Event->x();
+	m_LastY = a_Event->y();
+	m_IsMouseDragging = true;
+}
+
+
+
+
+
+void BiomeView::mouseMoveEvent(QMouseEvent * a_Event)
+{
+	if (m_IsMouseDragging)
+	{
+		// The user is dragging the mouse, move the view around:
+		m_X += (m_LastX - a_Event->x()) / m_Zoom;
+		m_Z += (m_LastY - a_Event->y()) / m_Zoom;
+		m_LastX = a_Event->x();
+		m_LastY = a_Event->y();
+		redraw();
+		return;
+	}
+
+	// TODO: Update the status bar info for the biome currently pointed at
+}
+
+
+
+
+
+void BiomeView::mouseReleaseEvent(QMouseEvent *)
+{
+	m_IsMouseDragging = false;
+}
+
+
+
+
+
+void BiomeView::wheelEvent(QWheelEvent * a_Event)
+{
+	m_Zoom += floor(a_Event->delta() / 90.0);
+	m_Zoom = Clamp(m_Zoom, 1.0, 20.0);
+	redraw();
+}
+
+
+
+
+
+void BiomeView::keyPressEvent(QKeyEvent * a_Event)
+{
+	switch (a_Event->key())
+	{
+		case Qt::Key_Up:
+		case Qt::Key_W:
+		{
+			m_Z -= 10.0 / m_Zoom;
+			redraw();
+			break;
+		}
+
+		case Qt::Key_Down:
+		case Qt::Key_S:
+		{
+			m_Z += 10.0 / m_Zoom;
+			redraw();
+			break;
+		}
+
+		case Qt::Key_Left:
+		case Qt::Key_A:
+		{
+			m_X -= 10.0 / m_Zoom;
+			redraw();
+			break;
+		}
+
+		case Qt::Key_Right:
+		case Qt::Key_D:
+		{
+			m_X += 10.0 / m_Zoom;
+			redraw();
+			break;
+		}
+
+		case Qt::Key_PageUp:
+		case Qt::Key_Q:
+		{
+			m_Zoom++;
+			if (m_Zoom > 20.0)
+			{
+				m_Zoom = 20.0;
+			}
+			redraw();
+			break;
+		}
+
+		case Qt::Key_PageDown:
+		case Qt::Key_E:
+		{
+			m_Zoom--;
+			if (m_Zoom < 1.0)
+			{
+				m_Zoom = 1.0;
+			}
+			redraw();
+			break;
+		}
+	}
 }
 
 
diff --git a/Tools/QtBiomeVisualiser/BiomeView.h b/Tools/QtBiomeVisualiser/BiomeView.h
index c54c66491..8aae43df0 100644
--- a/Tools/QtBiomeVisualiser/BiomeView.h
+++ b/Tools/QtBiomeVisualiser/BiomeView.h
@@ -35,10 +35,20 @@ public slots:
 
 protected:
 	double m_X, m_Z;
-	int m_Zoom;
+	double m_Zoom;
+
+	/** Cache for the loaded chunk data. */
 	ChunkCache m_Cache;
+
+	/** The entire view's contents in an offscreen image. */
 	QImage m_Image;
 
+	/** Coords of the mouse for the previous position, used while dragging. */
+	int m_LastX, m_LastY;
+
+	/** Set to true when the user has a mouse button depressed, and is dragging the view. */
+	bool m_IsMouseDragging;
+
 	/** Data used for rendering a chunk that hasn't been loaded yet */
 	uchar m_EmptyChunkImage[16 * 16 * 4];
 
@@ -55,8 +65,20 @@ protected:
 	/** Paints the entire widget */
 	virtual void paintEvent(QPaintEvent *) override;
 
-	/** Queues the chunk for rendering. */
-	void queueChunkRender(ChunkPtr a_Chunk);
+	/** Called when the user presses any mouse button. */
+	virtual void mousePressEvent(QMouseEvent * a_Event);
+
+	/** Called when the user moves the mouse. */
+	virtual void mouseMoveEvent(QMouseEvent * a_Event);
+
+	/** Called when the user releases a previously held mouse button. */
+	virtual void mouseReleaseEvent(QMouseEvent * a_Event) override;
+
+	/** Called when the user rotates the mouse wheel. */
+	virtual void wheelEvent(QWheelEvent * a_Event) override;
+
+	/** Called when the user presses a key. */
+	virtual void keyPressEvent(QKeyEvent * a_Event) override;
 };
 
 

From ddf130f849f81670254ea2baf79fd06adcc0f302 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Sun, 14 Sep 2014 22:20:16 +0200
Subject: [PATCH 05/28] QtBiomeVisualiser: Extended zoom down below 100%.

---
 Tools/QtBiomeVisualiser/BiomeView.cpp | 87 ++++++++++++++++++++++-----
 Tools/QtBiomeVisualiser/BiomeView.h   |  9 +++
 2 files changed, 80 insertions(+), 16 deletions(-)

diff --git a/Tools/QtBiomeVisualiser/BiomeView.cpp b/Tools/QtBiomeVisualiser/BiomeView.cpp
index 3d24ed126..671942440 100644
--- a/Tools/QtBiomeVisualiser/BiomeView.cpp
+++ b/Tools/QtBiomeVisualiser/BiomeView.cpp
@@ -8,11 +8,19 @@
 
 
 
+static const int DELTA_STEP = 120;  // The normal per-notch wheel delta
+
+
+
+
+
 BiomeView::BiomeView(QWidget * parent) :
 	super(parent),
 	m_X(0),
 	m_Z(0),
-	m_Zoom(1)
+	m_Zoom(1),
+	m_IsMouseDragging(false),
+	m_MouseWheelDelta(0)
 {
 	// Create the image used for undefined chunks:
 	int offset = 0;
@@ -281,9 +289,17 @@ void BiomeView::mouseReleaseEvent(QMouseEvent *)
 
 void BiomeView::wheelEvent(QWheelEvent * a_Event)
 {
-	m_Zoom += floor(a_Event->delta() / 90.0);
-	m_Zoom = Clamp(m_Zoom, 1.0, 20.0);
-	redraw();
+	m_MouseWheelDelta += a_Event->delta();
+	while (m_MouseWheelDelta >= DELTA_STEP)
+	{
+		increaseZoom();
+		m_MouseWheelDelta -= DELTA_STEP;
+	}
+	while (m_MouseWheelDelta <= -DELTA_STEP)
+	{
+		decreaseZoom();
+		m_MouseWheelDelta += DELTA_STEP;
+	}
 }
 
 
@@ -329,24 +345,14 @@ void BiomeView::keyPressEvent(QKeyEvent * a_Event)
 		case Qt::Key_PageUp:
 		case Qt::Key_Q:
 		{
-			m_Zoom++;
-			if (m_Zoom > 20.0)
-			{
-				m_Zoom = 20.0;
-			}
-			redraw();
+			increaseZoom();
 			break;
 		}
 
 		case Qt::Key_PageDown:
 		case Qt::Key_E:
 		{
-			m_Zoom--;
-			if (m_Zoom < 1.0)
-			{
-				m_Zoom = 1.0;
-			}
-			redraw();
+			decreaseZoom();
 			break;
 		}
 	}
@@ -355,3 +361,52 @@ void BiomeView::keyPressEvent(QKeyEvent * a_Event)
 
 
 
+
+void BiomeView::decreaseZoom()
+{
+	if (m_Zoom > 1.001)
+	{
+		m_Zoom--;
+		if (m_Zoom < 1.0)
+		{
+			// Just crossed the 100%, fixate the 100% threshold:
+			m_Zoom = 1.0;
+		}
+	}
+	else if (m_Zoom > 0.01)
+	{
+		m_Zoom = m_Zoom / 2;
+	}
+	redraw();
+}
+
+
+
+
+
+void BiomeView::increaseZoom()
+{
+	if (m_Zoom > 0.99)
+	{
+		if (m_Zoom > 20.0)
+		{
+			// Zoom too large
+			return;
+		}
+		m_Zoom++;
+	}
+	else
+	{
+		m_Zoom = m_Zoom * 2;
+		if (m_Zoom > 1.0)
+		{
+			// Just crossed the 100%, fixate the 100% threshold:
+			m_Zoom = 1.0;
+		}
+	}
+	redraw();
+}
+
+
+
+
diff --git a/Tools/QtBiomeVisualiser/BiomeView.h b/Tools/QtBiomeVisualiser/BiomeView.h
index 8aae43df0..61bda45c2 100644
--- a/Tools/QtBiomeVisualiser/BiomeView.h
+++ b/Tools/QtBiomeVisualiser/BiomeView.h
@@ -49,6 +49,9 @@ protected:
 	/** Set to true when the user has a mouse button depressed, and is dragging the view. */
 	bool m_IsMouseDragging;
 
+	/** Accumulator for the mouse wheel's delta. When the accumulator hits a threshold, the view zooms. */
+	int m_MouseWheelDelta;
+
 	/** Data used for rendering a chunk that hasn't been loaded yet */
 	uchar m_EmptyChunkImage[16 * 16 * 4];
 
@@ -79,6 +82,12 @@ protected:
 
 	/** Called when the user presses a key. */
 	virtual void keyPressEvent(QKeyEvent * a_Event) override;
+
+	/** Decreases the zoom level and queues a redraw. */
+	void decreaseZoom();
+
+	/** Increases the zoom level and queues a redraw. */
+	void increaseZoom();
 };
 
 

From d772bc032f12bceac2d974ad9165597edabe5b0a Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Mon, 15 Sep 2014 16:50:40 +0200
Subject: [PATCH 06/28] QtBiomeVisualiser: Added multithreading.

For some reason this makes the UI less responsive.
---
 Tools/QtBiomeVisualiser/ChunkSource.cpp | 74 +++++++++++++++++++++++--
 Tools/QtBiomeVisualiser/ChunkSource.h   | 37 +++++++++++--
 Tools/QtBiomeVisualiser/MainWindow.cpp  | 14 +----
 3 files changed, 102 insertions(+), 23 deletions(-)

diff --git a/Tools/QtBiomeVisualiser/ChunkSource.cpp b/Tools/QtBiomeVisualiser/ChunkSource.cpp
index 44dcf1fa7..5658198f4 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.cpp
+++ b/Tools/QtBiomeVisualiser/ChunkSource.cpp
@@ -1,6 +1,8 @@
 #include "Globals.h"
 #include "ChunkSource.h"
+#include <QThread>
 #include "Generating/BioGen.h"
+#include "inifile/iniFile.h"
 
 
 
@@ -138,9 +140,12 @@ static void biomesToImage(cChunkDef::BiomeMap & a_Biomes, Chunk::Image & a_Image
 ////////////////////////////////////////////////////////////////////////////////
 // BioGenSource:
 
-BioGenSource::BioGenSource(cBiomeGen * a_BiomeGen) :
-	m_BiomeGen(a_BiomeGen)
+BioGenSource::BioGenSource(QString a_WorldIniPath) :
+	m_WorldIniPath(a_WorldIniPath),
+	m_WorldIni(new cIniFile),
+	m_Mtx(QMutex::Recursive)
 {
+	reload();
 }
 
 
@@ -149,11 +154,14 @@ BioGenSource::BioGenSource(cBiomeGen * a_BiomeGen) :
 
 void BioGenSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChunk)
 {
-	// TODO: To make use of multicore machines, we need multiple copies of the biomegen
-	// Right now we have only one, so we can let only one thread use it (hence the mutex)
-	QMutexLocker lock(&m_Mtx);
+	cBiomeGenPtr biomeGen;
+	{
+		QMutexLocker lock(&m_Mtx);
+		biomeGen = getBiomeGen();
+	}
 	cChunkDef::BiomeMap biomes;
-	m_BiomeGen->GenBiomes(a_ChunkX, a_ChunkZ, biomes);
+	biomeGen->GenBiomes(a_ChunkX, a_ChunkZ, biomes);
+	releaseBiomeGen(biomeGen);
 	Chunk::Image img;
 	biomesToImage(biomes, img);
 	a_DestChunk->setImage(img);
@@ -162,3 +170,57 @@ void BioGenSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChu
 
 
 
+
+void BioGenSource::reload()
+{
+	{
+		QMutexLocker lock(&m_Mtx);
+		if (!m_WorldIni->ReadFile(m_WorldIniPath.toStdString()))
+		{
+			return;
+		}
+		m_AvailableGens.clear();
+	}
+}
+
+
+
+
+cBiomeGenPtr BioGenSource::getBiomeGen()
+{
+	QMutexLocker lock(&m_Mtx);
+
+	// Return a generator from the cache, if available:
+	if (!m_AvailableGens.empty())
+	{
+		cBiomeGenPtr res = m_AvailableGens.back();
+		m_AvailableGens.pop_back();
+		return res;
+	}
+
+	// No generator in cache available, create a new one:
+	int seed = m_WorldIni->GetValueSetI("Seed", "Seed", 0);
+	bool unused = false;
+	return cBiomeGenPtr(cBiomeGen::CreateBiomeGen(*m_WorldIni, seed, unused));
+}
+
+
+
+
+
+void BioGenSource::releaseBiomeGen(cBiomeGenPtr a_BiomeGen)
+{
+	QMutexLocker lock(&m_Mtx);
+	m_AvailableGens.push_back(a_BiomeGen);
+
+	// Trim the cache if there are too many gens:
+	int wantedNumGens = QThread::idealThreadCount();
+	if (m_AvailableGens.size() > (size_t)(4 * wantedNumGens))
+	{
+		m_AvailableGens.resize(wantedNumGens);
+	}
+}
+
+
+
+
diff --git a/Tools/QtBiomeVisualiser/ChunkSource.h b/Tools/QtBiomeVisualiser/ChunkSource.h
index d6eb2e3cb..7bbdda276 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.h
+++ b/Tools/QtBiomeVisualiser/ChunkSource.h
@@ -1,4 +1,5 @@
 #pragma once
+#include <QString>
 #include "Chunk.h"
 
 
@@ -7,6 +8,8 @@
 
 // fwd:
 class cBiomeGen;
+typedef std::shared_ptr<cBiomeGen> cBiomeGenPtr;
+class cIniFile;
 
 
 
@@ -21,6 +24,9 @@ public:
 	/** Fills the a_DestChunk with the biomes for the specified coords.
 	It is expected to be thread-safe and re-entrant. Usually QThread::idealThreadCount() threads are used. */
 	virtual void getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChunk) = 0;
+
+	/** Forces a fresh reload of the source. Useful mainly for the generator, whose underlying definition file may have been changed. */
+	virtual void reload() = 0;
 };
 
 
@@ -32,15 +38,36 @@ class BioGenSource :
 	public ChunkSource
 {
 public:
-	/** Constructs a new BioGenSource based on the biome generator given.
-	Takes ownership of a_BiomeGen */
-	BioGenSource(cBiomeGen * a_BiomeGen);
+	/** Constructs a new BioGenSource based on the biome generator that is defined in the specified world.ini file. */
+	BioGenSource(QString a_WorldIniPath);
 
+	// ChunkSource overrides:
 	virtual void getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChunk) override;
+	virtual void reload(void) override;
 
 protected:
-	std::shared_ptr<cBiomeGen> m_BiomeGen;
+	/** Path to the world.ini file from which the m_WorldIni is regenerated on reload requests. */
+	QString m_WorldIniPath;
+
+	/** Parsed contents of the world.ini file from which the biome generators are initialized.
+	Locked by m_Mtx to avoid multithreaded access. */
+	std::unique_ptr<cIniFile> m_WorldIni;
+
+	/** List of cBiomeGen instances that are "free" - aren't doing any generating at this moment.
+	Locked by m_Mtx to avoid multithreaded access. */
+	std::vector<cBiomeGenPtr> m_AvailableGens;
+
+	/** Guards m_AvailableGens and m_WorldIni against multithreaded access. */
 	QMutex m_Mtx;
+
+
+	/** Returns a cBiomeGen that can generate a new chunk's biomes.
+	Uses m_AvailableGens as a cache before creating a new generator. */
+	cBiomeGenPtr BioGenSource::getBiomeGen();
+
+	/** Puts the specified BiomeGen back to m_AvailableGens to make it available for next getBiomeGen() request.
+	Truncates m_AvailableGens if there are too many instances in there. */
+	void releaseBiomeGen(cBiomeGenPtr a_BiomeGen);
 };
 
 
@@ -52,7 +79,9 @@ class AnvilSource :
 public:
 	// TODO
 
+	// ChunkSource overrides:
 	virtual void getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChunk) override;
+	virtual void reload() override {}
 };
 
 
diff --git a/Tools/QtBiomeVisualiser/MainWindow.cpp b/Tools/QtBiomeVisualiser/MainWindow.cpp
index 8b98c0b0e..21fb1a0c0 100644
--- a/Tools/QtBiomeVisualiser/MainWindow.cpp
+++ b/Tools/QtBiomeVisualiser/MainWindow.cpp
@@ -39,19 +39,7 @@ MainWindow::~MainWindow()
 void MainWindow::generate()
 {
 	QString worldIni = QFileDialog::getOpenFileName(this, tr("Open world.ini"), QString(), tr("world.ini (world.ini)"));
-	cIniFile ini;
-	if (!ini.ReadFile(worldIni.toStdString()))
-	{
-		return;
-	}
-	int seed = ini.GetValueSetI("Seed", "Seed", 0);
-	bool unused = false;
-	cBiomeGen * biomeGen = cBiomeGen::CreateBiomeGen(ini, seed, unused);
-	if (biomeGen == nullptr)
-	{
-		return;
-	}
-	m_BiomeView->setChunkSource(std::shared_ptr<BioGenSource>(new BioGenSource(biomeGen)));
+	m_BiomeView->setChunkSource(std::shared_ptr<BioGenSource>(new BioGenSource(worldIni)));
 	m_BiomeView->redraw();
 }
 

From 84947a22ad2c2ccb91733e171566433731eb0f48 Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Mon, 15 Sep 2014 17:20:54 +0200
Subject: [PATCH 07/28] QtBiomeVisualiser: removed multithreading.

It was slowing things down, the granularity is too fine.
---
 Tools/QtBiomeVisualiser/ChunkSource.cpp | 55 ++++---------------------
 Tools/QtBiomeVisualiser/ChunkSource.h   | 20 ++-------
 2 files changed, 10 insertions(+), 65 deletions(-)

diff --git a/Tools/QtBiomeVisualiser/ChunkSource.cpp b/Tools/QtBiomeVisualiser/ChunkSource.cpp
index 5658198f4..7da36c39b 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.cpp
+++ b/Tools/QtBiomeVisualiser/ChunkSource.cpp
@@ -142,7 +142,6 @@ static void biomesToImage(cChunkDef::BiomeMap & a_Biomes, Chunk::Image & a_Image
 
 BioGenSource::BioGenSource(QString a_WorldIniPath) :
 	m_WorldIniPath(a_WorldIniPath),
-	m_WorldIni(new cIniFile),
 	m_Mtx(QMutex::Recursive)
 {
 	reload();
@@ -154,14 +153,11 @@ BioGenSource::BioGenSource(QString a_WorldIniPath) :
 
 void BioGenSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChunk)
 {
-	cBiomeGenPtr biomeGen;
+	cChunkDef::BiomeMap biomes;
 	{
 		QMutexLocker lock(&m_Mtx);
-		biomeGen = getBiomeGen();
+		m_BiomeGen->GenBiomes(a_ChunkX, a_ChunkZ, biomes);
 	}
-	cChunkDef::BiomeMap biomes;
-	biomeGen->GenBiomes(a_ChunkX, a_ChunkZ, biomes);
-	releaseBiomeGen(biomeGen);
 	Chunk::Image img;
 	biomesToImage(biomes, img);
 	a_DestChunk->setImage(img);
@@ -173,52 +169,15 @@ void BioGenSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChu
 
 void BioGenSource::reload()
 {
+	cIniFile ini;
+	if (!ini.ReadFile(m_WorldIniPath.toStdString()))
 	{
-		QMutexLocker lock(&m_Mtx);
-		if (!m_WorldIni->ReadFile(m_WorldIniPath.toStdString()))
-		{
-			return;
-		}
-		m_AvailableGens.clear();
+		return;
 	}
-}
-
-
-
-
-cBiomeGenPtr BioGenSource::getBiomeGen()
-{
-	QMutexLocker lock(&m_Mtx);
-
-	// Return a generator from the cache, if available:
-	if (!m_AvailableGens.empty())
-	{
-		cBiomeGenPtr res = m_AvailableGens.back();
-		m_AvailableGens.pop_back();
-		return res;
-	}
-
-	// No generator in cache available, create a new one:
-	int seed = m_WorldIni->GetValueSetI("Seed", "Seed", 0);
+	int seed = ini.GetValueSetI("Seed", "Seed", 0);
 	bool unused = false;
-	return cBiomeGenPtr(cBiomeGen::CreateBiomeGen(*m_WorldIni, seed, unused));
-}
-
-
-
-
-
-void BioGenSource::releaseBiomeGen(cBiomeGenPtr a_BiomeGen)
-{
 	QMutexLocker lock(&m_Mtx);
-	m_AvailableGens.push_back(a_BiomeGen);
-
-	// Trim the cache if there are too many gens:
-	int wantedNumGens = QThread::idealThreadCount();
-	if (m_AvailableGens.size() > (size_t)(4 * wantedNumGens))
-	{
-		m_AvailableGens.resize(wantedNumGens);
-	}
+	m_BiomeGen.reset(cBiomeGen::CreateBiomeGen(ini, seed, unused));
 }
 
 
diff --git a/Tools/QtBiomeVisualiser/ChunkSource.h b/Tools/QtBiomeVisualiser/ChunkSource.h
index 7bbdda276..a485e473a 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.h
+++ b/Tools/QtBiomeVisualiser/ChunkSource.h
@@ -49,25 +49,11 @@ protected:
 	/** Path to the world.ini file from which the m_WorldIni is regenerated on reload requests. */
 	QString m_WorldIniPath;
 
-	/** Parsed contents of the world.ini file from which the biome generators are initialized.
-	Locked by m_Mtx to avoid multithreaded access. */
-	std::unique_ptr<cIniFile> m_WorldIni;
+	/** The generator used for generating biomes. */
+	std::unique_ptr<cBiomeGen> m_BiomeGen;
 
-	/** List of cBiomeGen instances that are "free" - aren't doing any generating at this moment.
-	Locked by m_Mtx to avoid multithreaded access. */
-	std::vector<cBiomeGenPtr> m_AvailableGens;
-
-	/** Guards m_AvailableGens and m_WorldIni against multithreaded access. */
+	/** Guards m_BiomeGen against multithreaded access. */
 	QMutex m_Mtx;
-
-
-	/** Returns a cBiomeGen that can generate a new chunk's biomes.
-	Uses m_AvailableGens as a cache before creating a new generator. */
-	cBiomeGenPtr BioGenSource::getBiomeGen();
-
-	/** Puts the specified BiomeGen back to m_AvailableGens to make it available for next getBiomeGen() request.
-	Truncates m_AvailableGens if there are too many instances in there. */
-	void releaseBiomeGen(cBiomeGenPtr a_BiomeGen);
 };
 
 

From 21b70f17c264de4f7c216cfca580e8254df5cbee Mon Sep 17 00:00:00 2001
From: Mattes D <github@xoft.cz>
Date: Mon, 15 Sep 2014 17:29:34 +0200
Subject: [PATCH 08/28] QtBiomeVisualiser: Added reloading.

---
 Tools/QtBiomeVisualiser/BiomeView.cpp  | 15 +++++++++++++++
 Tools/QtBiomeVisualiser/BiomeView.h    |  3 +++
 Tools/QtBiomeVisualiser/ChunkCache.cpp | 16 ++++++++++++++++
 Tools/QtBiomeVisualiser/ChunkCache.h   |  5 ++++-
 Tools/QtBiomeVisualiser/MainWindow.cpp | 13 ++++++++++---
 Tools/QtBiomeVisualiser/MainWindow.h   |  1 +
 6 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/Tools/QtBiomeVisualiser/BiomeView.cpp b/Tools/QtBiomeVisualiser/BiomeView.cpp
index 671942440..bbaccb369 100644
--- a/Tools/QtBiomeVisualiser/BiomeView.cpp
+++ b/Tools/QtBiomeVisualiser/BiomeView.cpp
@@ -131,6 +131,21 @@ void BiomeView::chunkAvailable(int a_ChunkX, int a_ChunkZ)
 
 
 
+void BiomeView::reload()
+{
+	if (!hasData())
+	{
+		return;
+	}
+	m_Cache.reload();
+
+	redraw();
+}
+
+
+
+
+
 void BiomeView::drawChunk(int a_ChunkX, int a_ChunkZ)
 {
 	if (!hasData())
diff --git a/Tools/QtBiomeVisualiser/BiomeView.h b/Tools/QtBiomeVisualiser/BiomeView.h
index 61bda45c2..86af8bcaf 100644
--- a/Tools/QtBiomeVisualiser/BiomeView.h
+++ b/Tools/QtBiomeVisualiser/BiomeView.h
@@ -33,6 +33,9 @@ public slots:
 	/** A specified chunk has become available, redraw it. */
 	void chunkAvailable(int a_ChunkX, int a_ChunkZ);
 
+	/** Reloads the current chunk source and redraws the entire workspace. */
+	void reload();
+
 protected:
 	double m_X, m_Z;
 	double m_Zoom;
diff --git a/Tools/QtBiomeVisualiser/ChunkCache.cpp b/Tools/QtBiomeVisualiser/ChunkCache.cpp
index b2230def0..05c267d30 100644
--- a/Tools/QtBiomeVisualiser/ChunkCache.cpp
+++ b/Tools/QtBiomeVisualiser/ChunkCache.cpp
@@ -76,6 +76,22 @@ void ChunkCache::setChunkSource(std::shared_ptr<ChunkSource> a_ChunkSource)
 
 
 
+void ChunkCache::reload()
+{
+	assert(m_ChunkSource.get() != nullptr);
+
+	// Reload the chunk source:
+	m_ChunkSource->reload();
+
+	// Clear the cache:
+	QMutexLocker lock(&m_Mtx);
+	m_Cache.clear();
+}
+
+
+
+
+
 void ChunkCache::gotChunk(int a_ChunkX, int a_ChunkZ)
 {
 	emit chunkAvailable(a_ChunkX, a_ChunkZ);
diff --git a/Tools/QtBiomeVisualiser/ChunkCache.h b/Tools/QtBiomeVisualiser/ChunkCache.h
index 0efa7fc39..0134bc7af 100644
--- a/Tools/QtBiomeVisualiser/ChunkCache.h
+++ b/Tools/QtBiomeVisualiser/ChunkCache.h
@@ -36,7 +36,10 @@ public:
 	void setChunkSource(std::shared_ptr<ChunkSource> a_ChunkSource);
 
 	/** Returns true iff the chunk source has been initialized. */
-	bool hasData(void) const { return (m_ChunkSource.get() != nullptr); }
+	bool hasData() const { return (m_ChunkSource.get() != nullptr); }
+
+	/** Reloads the current chunk source. */
+	void reload();
 
 signals:
 	void chunkAvailable(int a_ChunkX, int a_ChunkZ);
diff --git a/Tools/QtBiomeVisualiser/MainWindow.cpp b/Tools/QtBiomeVisualiser/MainWindow.cpp
index 21fb1a0c0..65d0ccf5e 100644
--- a/Tools/QtBiomeVisualiser/MainWindow.cpp
+++ b/Tools/QtBiomeVisualiser/MainWindow.cpp
@@ -16,11 +16,11 @@
 MainWindow::MainWindow(QWidget * parent) :
 	QMainWindow(parent)
 {
-	createActions();
-	createMenus();
-
 	m_BiomeView = new BiomeView(this);
 	setCentralWidget(m_BiomeView);
+
+	createActions();
+	createMenus();
 }
 
 
@@ -68,6 +68,11 @@ void MainWindow::createActions()
 	m_actOpen->setStatusTip(tr("Open an existing world and display its biomes"));
 	connect(m_actOpen, SIGNAL(triggered()), this, SLOT(open()));
 
+	m_actReload = new QAction(tr("&Reload"), this);
+	m_actReload->setShortcut(tr("F5"));
+	m_actReload->setStatusTip(tr("Open an existing world and display its biomes"));
+	connect(m_actReload, SIGNAL(triggered()), m_BiomeView, SLOT(reload()));
+
 	m_actExit = new QAction(tr("E&xit"), this);
 	m_actExit->setShortcut(tr("Alt+X"));
 	m_actExit->setStatusTip(tr("Exit %1").arg(QApplication::instance()->applicationName()));
@@ -84,6 +89,8 @@ void MainWindow::createMenus()
 	mFile->addAction(m_actGen);
 	mFile->addAction(m_actOpen);
 	mFile->addSeparator();
+	mFile->addAction(m_actReload);
+	mFile->addSeparator();
 	mFile->addAction(m_actExit);
 }
 
diff --git a/Tools/QtBiomeVisualiser/MainWindow.h b/Tools/QtBiomeVisualiser/MainWindow.h
index f6028aff1..b37bf4120 100644
--- a/Tools/QtBiomeVisualiser/MainWindow.h
+++ b/Tools/QtBiomeVisualiser/MainWindow.h
@@ -29,6 +29,7 @@ protected:
 	// Actions:
 	QAction * m_actGen;
 	QAction * m_actOpen;
+	QAction * m_actReload;
 	QAction * m_actExit;
 
 

From 18743540bc5122a42d24148a273ce04717057ed3 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 15 Sep 2014 21:45:35 +0200
Subject: [PATCH 09/28] QtBiomeVisualiser: Fixed colors and read failures.

---
 Tools/QtBiomeVisualiser/ChunkSource.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/Tools/QtBiomeVisualiser/ChunkSource.cpp b/Tools/QtBiomeVisualiser/ChunkSource.cpp
index 7da36c39b..9e0ea5751 100644
--- a/Tools/QtBiomeVisualiser/ChunkSource.cpp
+++ b/Tools/QtBiomeVisualiser/ChunkSource.cpp
@@ -103,9 +103,9 @@ public:
 		for (size_t i = 0; i < ARRAYCOUNT(biomeColors); i++)
 		{
 			uchar * color = &biomeToColor[4 * biomeColors[i].m_Biome];
-			color[0] = biomeColors[i].m_Color[0];
+			color[0] = biomeColors[i].m_Color[2];
 			color[1] = biomeColors[i].m_Color[1];
-			color[2] = biomeColors[i].m_Color[2];
+			color[2] = biomeColors[i].m_Color[0];
 			color[3] = 0xff;
 		}
 	}
@@ -170,14 +170,13 @@ void BioGenSource::getChunkBiomes(int a_ChunkX, int a_ChunkZ, ChunkPtr a_DestChu
 void BioGenSource::reload()
 {
 	cIniFile ini;
-	if (!ini.ReadFile(m_WorldIniPath.toStdString()))
-	{
-		return;
-	}
+	ini.ReadFile(m_WorldIniPath.toStdString());
 	int seed = ini.GetValueSetI("Seed", "Seed", 0);
 	bool unused = false;
 	QMutexLocker lock(&m_Mtx);
 	m_BiomeGen.reset(cBiomeGen::CreateBiomeGen(ini, seed, unused));
+	lock.unlock();
+	ini.WriteFile(m_WorldIniPath.toStdString());
 }
 
 

From 96f45a48d4eb757096bc325f45729a21fba72caf Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Mon, 15 Sep 2014 22:34:33 +0200
Subject: [PATCH 10/28] VoronoiMap: Added Jitter and OddRowOffset params.

---
 src/VoronoiMap.cpp | 35 ++++++++++++++++++++++++++++++-----
 src/VoronoiMap.h   | 31 +++++++++++++++++++++++++------
 2 files changed, 55 insertions(+), 11 deletions(-)

diff --git a/src/VoronoiMap.cpp b/src/VoronoiMap.cpp
index 5efd09c01..68147ebfc 100644
--- a/src/VoronoiMap.cpp
+++ b/src/VoronoiMap.cpp
@@ -10,11 +10,13 @@
 
 
 
-cVoronoiMap::cVoronoiMap(int a_Seed, int a_CellSize) :
+cVoronoiMap::cVoronoiMap(int a_Seed, int a_CellSize, int a_JitterSize) :
 	m_Noise1(a_Seed + 1),
 	m_Noise2(a_Seed + 2),
 	m_Noise3(a_Seed + 3),
-	m_CellSize(a_CellSize),
+	m_CellSize(std::max(a_CellSize, 2)),
+	m_JitterSize(Clamp(a_JitterSize, 1, a_CellSize)),
+	m_OddRowOffset(0),
 	m_CurrentCellX(9999999),  // Cell coords that are definitely out of the range for normal generator, so that the first query will overwrite them
 	m_CurrentCellZ(9999999)
 {
@@ -26,7 +28,29 @@ cVoronoiMap::cVoronoiMap(int a_Seed, int a_CellSize) :
 
 void cVoronoiMap::SetCellSize(int a_CellSize)
 {
+	a_CellSize = std::max(a_CellSize, 2);  // Cell size must be at least 2
 	m_CellSize = a_CellSize;
+
+	// For compatibility with previous version, which didn't have the jitter, we set jitter here as well.
+	m_JitterSize = a_CellSize;
+}
+
+
+
+
+
+void cVoronoiMap::SetJitterSize(int a_JitterSize)
+{
+	m_JitterSize = Clamp(a_JitterSize, 1, m_CellSize);
+}
+
+
+
+
+
+void cVoronoiMap::SetOddRowOffset(int a_OddRowOffset)
+{
+	m_OddRowOffset = Clamp(a_OddRowOffset, -m_CellSize, m_CellSize);
 }
 
 
@@ -111,12 +135,13 @@ void cVoronoiMap::UpdateCell(int a_CellX, int a_CellZ)
 	for (int x = 0; x < 5; x++)
 	{
 		int BaseX = (NoiseBaseX + x) * m_CellSize;
+		int OddRowOffset = ((NoiseBaseX + x) & 0x01) * m_OddRowOffset;
 		for (int z = 0; z < 5; z++)
 		{
-			int OffsetX = (m_Noise1.IntNoise2DInt(NoiseBaseX + x, NoiseBaseZ + z) / 8) % m_CellSize;
-			int OffsetZ = (m_Noise2.IntNoise2DInt(NoiseBaseX + x, NoiseBaseZ + z) / 8) % m_CellSize;
+			int OffsetX = (m_Noise1.IntNoise2DInt(NoiseBaseX + x, NoiseBaseZ + z) / 8) % m_JitterSize;
+			int OffsetZ = (m_Noise2.IntNoise2DInt(NoiseBaseX + x, NoiseBaseZ + z) / 8) % m_JitterSize;
 			m_SeedX[x][z] = BaseX + OffsetX;
-			m_SeedZ[x][z] = (NoiseBaseZ + z) * m_CellSize + OffsetZ;
+			m_SeedZ[x][z] = (NoiseBaseZ + z) * m_CellSize + OddRowOffset + OffsetZ;
 		}  // for z
 	}  // for x
 	m_CurrentCellX = a_CellX;
diff --git a/src/VoronoiMap.h b/src/VoronoiMap.h
index 84cf206e9..49f6c1da1 100644
--- a/src/VoronoiMap.h
+++ b/src/VoronoiMap.h
@@ -18,18 +18,28 @@
 class cVoronoiMap
 {
 public:
-	cVoronoiMap(int a_Seed, int a_CellSize = 128);
+	cVoronoiMap(int a_Seed, int a_CellSize = 128, int a_JitterSize = 128);
 	
-	/// Sets the cell size used for generating the Voronoi seeds
+	/** Sets both the cell size and jitter size used for generating the Voronoi seeds. */
 	void SetCellSize(int a_CellSize);
+
+	/** Sets the jitter size. Clamps it to current cell size. */
+	void SetJitterSize(int a_JitterSize);
+
+	/** Sets the offset that is added to each odd row of cells.
+	This offset makes the voronoi cells align to a non-grid.
+	Clamps the value to [-m_CellSize, +m_CellSize]. */
+	void SetOddRowOffset(int a_OddRowOffset);
 	
-	/// Returns the value in the cell into which the specified point lies
+	/** Returns the value in the cell into which the specified point lies. */
 	int GetValueAt(int a_X, int a_Y);
 	
-	/// Returns the value in the cell into which the specified point lies, and the distance to the nearest Voronoi seed
+	/** Returns the value in the cell into which the specified point lies,
+	and the distance to the nearest Voronoi seed. */
 	int GetValueAt(int a_X, int a_Y, int & a_MinDistance);
 	
-	/// Returns the value in the cell into which the specified point lies, and the distances to the 2 nearest Voronoi seeds. Uses a cache
+	/** Returns the value in the cell into which the specified point lies,
+	and the distances to the 2 nearest Voronoi seeds. Uses a cache. */
 	int GetValueAt(int a_X, int a_Y, int & a_MinDistance1, int & a_MinDistance2);
 
 protected:
@@ -38,8 +48,17 @@ protected:
 	cNoise m_Noise2;
 	cNoise m_Noise3;
 	
-	/// Size of the Voronoi cells (avg X/Y distance between the seeds)
+	/** Size of the Voronoi cells (avg X/Y distance between the seeds). Expected to be at least 2. */
 	int m_CellSize;
+
+	/** The amount that the cell seeds may be offset from the grid.
+	Expected to be at least 1 and less than m_CellSize. */
+	int m_JitterSize;
+
+	/** The constant amount that the cell seeds of every odd row will be offset from the grid.
+	This allows us to have non-rectangular grids.
+	Expected to be between -m_CellSize and +m_CellSize. */
+	int m_OddRowOffset;
 	
 	/** The X coordinate of the currently cached cell neighborhood */
 	int m_CurrentCellX;

From be7483f26be138e337344b61799396994d3858a3 Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Tue, 16 Sep 2014 20:01:04 +0200
Subject: [PATCH 11/28] Pre 1.8 release

Added Gamemode Spectator
---
 src/Defines.h | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Defines.h b/src/Defines.h
index 78c58034e..6355b75b4 100644
--- a/src/Defines.h
+++ b/src/Defines.h
@@ -115,12 +115,14 @@ enum eGameMode
 	eGameMode_Survival  = 0,
 	eGameMode_Creative  = 1,
 	eGameMode_Adventure = 2,
+	eGameMode_Spectator = 3,
 	
 	// Easier-to-use synonyms:
 	gmNotSet    = eGameMode_NotSet,
 	gmSurvival  = eGameMode_Survival,
 	gmCreative  = eGameMode_Creative,
 	gmAdventure = eGameMode_Adventure,
+	gmSpectator = eGameMode_Spectator,
 	
 	// These two are used to check GameMode for validity when converting from integers.
 	gmMax,  // Gets automatically assigned

From 8dedbe4db52ee434595d9bdb32b3850a6c1e175f Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Tue, 16 Sep 2014 20:02:27 +0200
Subject: [PATCH 12/28] Preparing 1.8 changes

Added Spectator Gamemode
---
 src/Entities/Player.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/Entities/Player.h b/src/Entities/Player.h
index 9821cc6d9..d64dd6b99 100644
--- a/src/Entities/Player.h
+++ b/src/Entities/Player.h
@@ -171,6 +171,9 @@ public:
 	/** Returns true if the player is in Adventure mode, either explicitly, or by inheriting from current world */
 	bool IsGameModeAdventure(void) const;
 	
+	/** Returns true if the player is in Spectator mode, either explicitly, or by inheriting from current world */
+	bool IsGameModeSpectator(void) const;
+	
 	AString GetIP(void) const { return m_IP; }  // tolua_export
 
 	/** Returns the associated team, NULL if none */

From 120b23d65eefdd6e29b1605b10b852a1069e5444 Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Tue, 16 Sep 2014 20:04:17 +0200
Subject: [PATCH 13/28] Pre 1.8 release

Added Spectator gamemode
---
 src/Entities/Player.cpp | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index ea795e346..81250bd40 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1043,6 +1043,14 @@ bool cPlayer::IsGameModeAdventure(void) const
 
 
 
+bool cPlayer::IsGameModeSpectator(void) const
+{
+	return (m_GameMode == gmSpectator) ||  // Either the player is explicitly in Spectator
+		((m_GameMode == gmNotSet) &&  m_World->IsGameModeSpectator());  // or they inherit from the world and the world is Adventure
+}
+
+
+
 
 void cPlayer::SetTeam(cTeam * a_Team)
 {

From f246faec1636ba9a7e5850dfbbb568d1b7dff0b9 Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Tue, 16 Sep 2014 20:05:55 +0200
Subject: [PATCH 14/28] Preparing 1.8 update

Added Spectator gamemode
---
 src/World.h | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/World.h b/src/World.h
index 0c57e6611..6f680694f 100644
--- a/src/World.h
+++ b/src/World.h
@@ -188,6 +188,9 @@ public:
 	/** Returns true if the world is in Adventure mode */
 	bool IsGameModeAdventure(void) const { return (m_GameMode == gmAdventure); }
 	
+	/** Returns true if the world is in Spectator mode */
+	bool IsGameModeAdventure(void) const { return (m_GameMode == gmSpectator); }
+	
 	bool IsPVPEnabled(void) const { return m_bEnabledPVP; }
 	bool IsDeepSnowEnabled(void) const { return m_IsDeepSnowEnabled; }
 	

From 89c9aec5da5adfcaee06df9979bc701579d19f6d Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Tue, 16 Sep 2014 20:17:35 +0200
Subject: [PATCH 15/28] Preparing 1.8 update

Partially added Spectator gamemode
---
 src/Entities/Player.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 81250bd40..0f15ba620 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -1166,7 +1166,7 @@ void cPlayer::SetGameMode(eGameMode a_GameMode)
 	m_GameMode = a_GameMode;
 	m_ClientHandle->SendGameMode(a_GameMode);
 
-	if (!IsGameModeCreative())
+	if (!(IsGameModeCreative() || IsGameModeSpectator()))
 	{
 		SetFlying(false);
 		SetCanFly(false);
@@ -1348,6 +1348,7 @@ void cPlayer::MoveTo( const Vector3d & a_NewPos)
 
 void cPlayer::SetVisible(bool a_bVisible)
 {
+	// Need to Check if this or other players are in gamemode spectator
 	if (a_bVisible && !m_bVisible)  // Make visible
 	{
 		m_bVisible = true;

From 3406957f1b4b6b49c1b571dcceb2b463def9e4c3 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 17 Sep 2014 09:38:06 +0200
Subject: [PATCH 16/28] Initial BungeeCord support.

Ref.: #1392
---
 src/Protocol/Protocol17x.cpp        |  9 +++++++++
 src/Protocol/ProtocolRecognizer.cpp |  2 +-
 src/StringUtils.cpp                 | 28 ++++++++++++++++++++++++++++
 src/StringUtils.h                   |  5 +++++
 4 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index f07f6a928..9ebb6b4b0 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -100,6 +100,15 @@ cProtocol172::cProtocol172(cClientHandle * a_Client, const AString & a_ServerAdd
 	m_IsEncrypted(false),
 	m_LastSentDimension(dimNotSet)
 {
+	// BungeeCord handling:
+	// If BC is setup with ip_forward == true, it sends additional data in the login packet's ServerAddress field:
+	// hostname\00ip-address\00uuid\00profile-properties-as-json
+	AStringVector Params;
+	if (SplitZeroTerminatedStrings(a_ServerAddress, Params) && (Params.size() == 4))
+	{
+		m_ServerAddress = Params[0];
+	}
+	
 	// Create the comm log file, if so requested:
 	if (g_ShouldLogCommIn || g_ShouldLogCommOut)
 	{
diff --git a/src/Protocol/ProtocolRecognizer.cpp b/src/Protocol/ProtocolRecognizer.cpp
index 8b395230a..d836291c3 100644
--- a/src/Protocol/ProtocolRecognizer.cpp
+++ b/src/Protocol/ProtocolRecognizer.cpp
@@ -27,7 +27,7 @@
 cProtocolRecognizer::cProtocolRecognizer(cClientHandle * a_Client) :
 	super(a_Client),
 	m_Protocol(NULL),
-	m_Buffer(512)
+	m_Buffer(8192)     // We need a larger buffer to support BungeeCord - it sends one huge packet at the start
 {
 }
 
diff --git a/src/StringUtils.cpp b/src/StringUtils.cpp
index 5f88cbf64..73147eebc 100644
--- a/src/StringUtils.cpp
+++ b/src/StringUtils.cpp
@@ -869,3 +869,31 @@ void SetBEInt(char * a_Mem, Int32 a_Value)
 
 
 
+
+bool SplitZeroTerminatedStrings(const AString & a_Strings, AStringVector & a_Output)
+{
+	a_Output.clear();
+	size_t size = a_Strings.size();
+	size_t start = 0;
+	bool res = false;
+	for (size_t i = 0; i < size; i++)
+	{
+		if (a_Strings[i] == 0)
+		{
+			a_Output.push_back(a_Strings.substr(start, i - start));
+			start = i + 1;
+			res = true;
+		}
+	}
+	if (start < size)
+	{
+		a_Output.push_back(a_Strings.substr(start, size - start));
+		res = true;
+	}
+	
+	return res;
+}
+
+
+
+
diff --git a/src/StringUtils.h b/src/StringUtils.h
index 72a90a8c2..a76894d05 100644
--- a/src/StringUtils.h
+++ b/src/StringUtils.h
@@ -99,6 +99,11 @@ extern int GetBEInt(const char * a_Mem);
 /// Writes four bytes to the specified memory location so that they interpret as BigEndian int
 extern void SetBEInt(char * a_Mem, Int32 a_Value);
 
+/** Splits a string that has embedded \0 characters, on those characters.
+a_Output is first cleared and then each separate string is pushed back into a_Output.
+Returns true if there are at least two strings in a_Output (there was at least one \0 separator). */
+extern bool SplitZeroTerminatedStrings(const AString & a_Strings, AStringVector & a_Output);
+
 /// Parses any integer type. Checks bounds and returns errors out of band.
 template <class T>
 bool StringToInteger(const AString & a_str, T & a_Num)

From 82317709f8645642069c1ddf3428a0341302fcd4 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 17 Sep 2014 11:07:42 +0200
Subject: [PATCH 17/28] Full BungeeCord compatibility.

Fixes #1392.
Fixes SpigotMC/BungeeCord#1211.
---
 src/ClientHandle.h           | 14 +++++++++++++-
 src/Protocol/Protocol17x.cpp |  4 ++++
 2 files changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/ClientHandle.h b/src/ClientHandle.h
index 74e89deee..3d0995636 100644
--- a/src/ClientHandle.h
+++ b/src/ClientHandle.h
@@ -64,15 +64,27 @@ public:
 
 	const AString & GetIPString(void) const { return m_IPString; }  // tolua_export
 	
+	/** Sets the IP string that the client is using. Overrides the IP string that was read from the socket.
+	Used mainly by BungeeCord compatibility code. */
+	void SetIPString(const AString & a_IPString) { m_IPString = a_IPString; }
+	
 	cPlayer * GetPlayer(void) { return m_Player; }  // tolua_export
 
 	/** Returns the player's UUID, as used by the protocol, in the short form (no dashes) */
 	const AString & GetUUID(void) const { return m_UUID; }  // tolua_export
 	
-	void SetUUID(const AString & a_UUID) { m_UUID = a_UUID; }
+	/** Sets the player's UUID, as used by the protocol. Short UUID form (no dashes) is expected.
+	Used mainly by BungeeCord compatibility code - when authenticating is done on the BungeeCord server
+	and the results are passed to MCS running in offline mode. */
+	void SetUUID(const AString & a_UUID) { ASSERT(a_UUID.size() == 32); m_UUID = a_UUID; }
 
 	const Json::Value & GetProperties(void) const { return m_Properties; }
 	
+	/** Sets the player's properties, such as skin image and signature.
+	Used mainly by BungeeCord compatibility code - property querying is done on the BungeeCord server
+	and the results are passed to MCS running in offline mode. */
+	void SetProperties(const Json::Value & a_Properties) { m_Properties = a_Properties; }
+	
 	/** Generates an UUID based on the username stored for this client, and stores it in the m_UUID member.
 	This is used for the offline (non-auth) mode, when there's no UUID source.
 	Each username generates a unique and constant UUID, so that when the player reconnects with the same name, their UUID is the same.
diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 9ebb6b4b0..4f71b53b0 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -106,7 +106,11 @@ cProtocol172::cProtocol172(cClientHandle * a_Client, const AString & a_ServerAdd
 	AStringVector Params;
 	if (SplitZeroTerminatedStrings(a_ServerAddress, Params) && (Params.size() == 4))
 	{
+		LOGD("Player at %s connected via BungeeCord", Params[1].c_str());
 		m_ServerAddress = Params[0];
+		m_Client->SetIPString(Params[1]);
+		m_Client->SetUUID(cMojangAPI::MakeUUIDShort(Params[2]));
+		m_Client->SetProperties(Params[3]);
 	}
 	
 	// Create the comm log file, if so requested:

From 010879e43f591726809800b45d783d247508daa1 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 17 Sep 2014 16:01:14 +0200
Subject: [PATCH 18/28] BungeeCord compatibility: don't overwrite UUID /
 properties.

---
 src/ClientHandle.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/ClientHandle.cpp b/src/ClientHandle.cpp
index 170498037..4a3a3c250 100644
--- a/src/ClientHandle.cpp
+++ b/src/ClientHandle.cpp
@@ -312,8 +312,16 @@ void cClientHandle::Authenticate(const AString & a_Name, const AString & a_UUID,
 	ASSERT(m_Player == NULL);
 
 	m_Username = a_Name;
-	m_UUID = a_UUID;
-	m_Properties = a_Properties;
+	
+	// Only assign UUID and properties if not already pre-assigned (BungeeCord sends those in the Handshake packet):
+	if (m_UUID.empty())
+	{
+		m_UUID = a_UUID;
+	}
+	if (m_Properties.empty())
+	{
+		m_Properties = a_Properties;
+	}
 	
 	// Send login success (if the protocol supports it):
 	m_Protocol->SendLoginSuccess();

From c63e14b6d11a97b56e17d628aebdd5e244999a15 Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Wed, 17 Sep 2014 17:15:47 +0200
Subject: [PATCH 19/28] Preparing 1.8 update

---
 src/Entities/Player.cpp | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 0f15ba620..660ad3239 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -451,6 +451,11 @@ void cPlayer::CancelChargingBow(void)
 
 void cPlayer::SetTouchGround(bool a_bTouchGround)
 {
+	if (IsGameModeSpectator()) // You can fly through the ground in survival
+	{
+		return;
+	}
+	
 	m_bTouchGround = a_bTouchGround;
 
 	if (!m_bTouchGround)
@@ -585,7 +590,7 @@ bool cPlayer::Feed(int a_Food, double a_Saturation)
 
 void cPlayer::AddFoodExhaustion(double a_Exhaustion)
 {
-	if (!IsGameModeCreative())
+	if (!(IsGameModeCreative() || IsGameModeSpectator()))
 	{
 		m_FoodExhaustionLevel = std::min(m_FoodExhaustionLevel + a_Exhaustion, 40.0);
 	}
@@ -823,9 +828,9 @@ bool cPlayer::DoTakeDamage(TakeDamageInfo & a_TDI)
 {
 	if ((a_TDI.DamageType != dtInVoid) && (a_TDI.DamageType != dtPlugin))
 	{
-		if (IsGameModeCreative())
+		if (IsGameModeCreative() || IsGameModeSpectator())
 		{
-			// No damage / health in creative mode if not void or plugin damage
+			// No damage / health in creative or spectator mode if not void or plugin damage
 			return false;
 		}
 	}
@@ -1348,7 +1353,7 @@ void cPlayer::MoveTo( const Vector3d & a_NewPos)
 
 void cPlayer::SetVisible(bool a_bVisible)
 {
-	// Need to Check if this or other players are in gamemode spectator
+	// Need to Check if the player or other players are in gamemode spectator, but will break compatibility
 	if (a_bVisible && !m_bVisible)  // Make visible
 	{
 		m_bVisible = true;
@@ -1509,6 +1514,11 @@ void cPlayer::TossPickup(const cItem & a_Item)
 
 void cPlayer::TossItems(const cItems & a_Items)
 {
+	if (IsGameModeSpectator()) // Players can't toss items in spectator
+	{
+		return;
+	}
+	
 	m_Stats.AddValue(statItemsDropped, (StatValue)a_Items.Size());
 
 	double vX = 0, vY = 0, vZ = 0;
@@ -1795,7 +1805,7 @@ bool cPlayer::SaveToDisk()
 
 void cPlayer::UseEquippedItem(int a_Amount)
 {
-	if (IsGameModeCreative())  // No damage in creative
+	if (IsGameModeCreative() || IsGameModeSpectator())  // No damage in creative or spectator
 	{
 		return;
 	}

From b70e09bc90ce28d9397de75ea80bdb669dfbf4ef Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Wed, 17 Sep 2014 17:32:37 +0200
Subject: [PATCH 20/28] Update World.h

---
 src/World.h | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/World.h b/src/World.h
index 6f680694f..8b40037af 100644
--- a/src/World.h
+++ b/src/World.h
@@ -189,7 +189,7 @@ public:
 	bool IsGameModeAdventure(void) const { return (m_GameMode == gmAdventure); }
 	
 	/** Returns true if the world is in Spectator mode */
-	bool IsGameModeAdventure(void) const { return (m_GameMode == gmSpectator); }
+	bool IsGameModeSpectator(void) const { return (m_GameMode == gmSpectator); }
 	
 	bool IsPVPEnabled(void) const { return m_bEnabledPVP; }
 	bool IsDeepSnowEnabled(void) const { return m_IsDeepSnowEnabled; }

From ccaec8f424f4cb59ced6518d7fb1171667728f1c Mon Sep 17 00:00:00 2001
From: Howaner <franzi.moos@googlemail.com>
Date: Wed, 17 Sep 2014 20:28:30 +0200
Subject: [PATCH 21/28] Fixed wrong url in the debuggers plugin

---
 MCServer/Plugins/Debuggers/Debuggers.lua | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/MCServer/Plugins/Debuggers/Debuggers.lua b/MCServer/Plugins/Debuggers/Debuggers.lua
index 0e7e647d5..66e06cb72 100644
--- a/MCServer/Plugins/Debuggers/Debuggers.lua
+++ b/MCServer/Plugins/Debuggers/Debuggers.lua
@@ -1502,7 +1502,7 @@ function OnPlayerJoined(a_Player)
 	-- Test composite chat chaining:
 	a_Player:SendMessage(cCompositeChat()
 		:AddTextPart("Hello, ")
-		:AddUrlPart(a_Player:GetName(), "www.mc-server.org", "u@2")
+		:AddUrlPart(a_Player:GetName(), "http://www.mc-server.org", "u@2")
 		:AddSuggestCommandPart(", and welcome.", "/help", "u")
 		:AddRunCommandPart(" SetDay", "/time set 0")
 	)

From 16e9deba8d61abad80ef8a1935db1207fd6c3a68 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 17 Sep 2014 20:55:46 +0200
Subject: [PATCH 22/28] Added an explicit setting for allowing BungeeCord
 handshake.

---
 src/Protocol/Protocol17x.cpp | 2 +-
 src/Server.cpp               | 7 +++++++
 src/Server.h                 | 8 ++++++++
 3 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Protocol/Protocol17x.cpp b/src/Protocol/Protocol17x.cpp
index 4f71b53b0..7d80e79fb 100644
--- a/src/Protocol/Protocol17x.cpp
+++ b/src/Protocol/Protocol17x.cpp
@@ -104,7 +104,7 @@ cProtocol172::cProtocol172(cClientHandle * a_Client, const AString & a_ServerAdd
 	// If BC is setup with ip_forward == true, it sends additional data in the login packet's ServerAddress field:
 	// hostname\00ip-address\00uuid\00profile-properties-as-json
 	AStringVector Params;
-	if (SplitZeroTerminatedStrings(a_ServerAddress, Params) && (Params.size() == 4))
+	if (cRoot::Get()->GetServer()->ShouldAllowBungeeCord() && SplitZeroTerminatedStrings(a_ServerAddress, Params) && (Params.size() == 4))
 	{
 		LOGD("Player at %s connected via BungeeCord", Params[1].c_str());
 		m_ServerAddress = Params[0];
diff --git a/src/Server.cpp b/src/Server.cpp
index 069e2a169..969ffd693 100644
--- a/src/Server.cpp
+++ b/src/Server.cpp
@@ -259,6 +259,13 @@ bool cServer::InitServer(cIniFile & a_SettingsIni)
 		m_ServerID = sid.str();
 		m_ServerID.resize(16, '0');
 	}
+
+	// Check if both BungeeCord and online mode are on, if so, warn the admin:
+	m_ShouldAllowBungeeCord = a_SettingsIni.GetValueSetB("Authentication", "AllowBungeeCord", false);
+	if (m_ShouldAllowBungeeCord && m_ShouldAuthenticate)
+	{
+		LOGWARNING("WARNING: BungeeCord is allowed and server set to online mode. This is unsafe and will not work properly. Disable either authentication or BungeeCord in settings.ini.");
+	}
 	
 	m_ShouldLoadOfflinePlayerData = a_SettingsIni.GetValueSetB("PlayerData", "LoadOfflinePlayerData", false);
 	m_ShouldLoadNamedPlayerData   = a_SettingsIni.GetValueSetB("PlayerData", "LoadNamedPlayerData", true);
diff --git a/src/Server.h b/src/Server.h
index f20e6932f..6d659fa40 100644
--- a/src/Server.h
+++ b/src/Server.h
@@ -131,6 +131,11 @@ public:  // tolua_export
 	Loaded from the settings.ini [PlayerData].LoadNamedPlayerData setting. */
 	bool ShouldLoadNamedPlayerData(void) const { return m_ShouldLoadNamedPlayerData; }
 	
+	/** Returns true if BungeeCord logins (that specify the player's UUID) are allowed.
+	Read from settings, admins should set this to true only when they chain to BungeeCord,
+	it makes the server vulnerable to identity theft through direct connections. */
+	bool ShouldAllowBungeeCord(void) const { return m_ShouldAllowBungeeCord; }
+	
 private:
 
 	friend class cRoot;  // so cRoot can create and destroy cServer
@@ -230,6 +235,9 @@ private:
 	This allows a seamless transition from name-based to UUID-based player storage.
 	Loaded from the settings.ini [PlayerData].LoadNamedPlayerData setting. */
 	bool m_ShouldLoadNamedPlayerData;
+	
+	/** True if BungeeCord handshake packets (with player UUID) should be accepted. */
+	bool m_ShouldAllowBungeeCord;
 
 
 	cServer(void);

From bf85c0b0abece030ba822223bd7b2dd6367e08eb Mon Sep 17 00:00:00 2001
From: nesco <emmanuel@federbusch.fr>
Date: Wed, 17 Sep 2014 21:17:06 +0200
Subject: [PATCH 23/28] Implementing Spectator Mode

Adding some proprieties of the spectator game mode in player.cpp :
- Players can't toss items
- Players can't touch the ground
---
 src/Entities/Player.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 660ad3239..3920bdb56 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -451,7 +451,7 @@ void cPlayer::CancelChargingBow(void)
 
 void cPlayer::SetTouchGround(bool a_bTouchGround)
 {
-	if (IsGameModeSpectator()) // You can fly through the ground in survival
+	if (IsGameModeSpectator()) // You can fly through the ground in Spectator
 	{
 		return;
 	}

From c979d4654838b00844b6e881826855676bc0961c Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 17 Sep 2014 22:37:37 +0200
Subject: [PATCH 24/28] Updated SQLiteCpp.

Our changes have made it into upstream, updating to sync with upstream master.
---
 lib/SQLiteCpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/SQLiteCpp b/lib/SQLiteCpp
index 203c2fb68..55edadd56 160000
--- a/lib/SQLiteCpp
+++ b/lib/SQLiteCpp
@@ -1 +1 @@
-Subproject commit 203c2fb68bbf871eaf4ca98756a113d74d620dea
+Subproject commit 55edadd56d0d6f506954ad00c3b9a5d425814a2f

From 6f5aa487ed45f88f0fd0fc8bcd0d4af8d2d67888 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 17 Sep 2014 23:24:22 +0200
Subject: [PATCH 25/28] Voronoi biomegen: Added JitterSize and OddRowOffset.

---
 src/Generating/BioGen.cpp | 148 ++++++++++++++++++++------------------
 src/VoronoiMap.cpp        |  91 ++++++++++++++++++-----
 src/VoronoiMap.h          |  13 +++-
 3 files changed, 164 insertions(+), 88 deletions(-)

diff --git a/src/Generating/BioGen.cpp b/src/Generating/BioGen.cpp
index 60ad4e3eb..217ca8f80 100644
--- a/src/Generating/BioGen.cpp
+++ b/src/Generating/BioGen.cpp
@@ -12,72 +12,6 @@
 
 
 
-////////////////////////////////////////////////////////////////////////////////
-// cBiomeGen:
-
-cBiomeGen * cBiomeGen::CreateBiomeGen(cIniFile & a_IniFile, int a_Seed, bool & a_CacheOffByDefault)
-{
-	AString BiomeGenName = a_IniFile.GetValueSet("Generator", "BiomeGen", "");
-	if (BiomeGenName.empty())
-	{
-		LOGWARN("[Generator] BiomeGen value not set in world.ini, using \"MultiStepMap\".");
-		BiomeGenName = "MultiStepMap";
-	}
-	
-	cBiomeGen * res = NULL;
-	a_CacheOffByDefault = false;
-	if (NoCaseCompare(BiomeGenName, "constant") == 0)
-	{
-		res = new cBioGenConstant;
-		a_CacheOffByDefault = true;  // we're generating faster than a cache would retrieve data :)
-	}
-	else if (NoCaseCompare(BiomeGenName, "checkerboard") == 0)
-	{
-		res = new cBioGenCheckerboard;
-		a_CacheOffByDefault = true;  // we're (probably) generating faster than a cache would retrieve data
-	}
-	else if (NoCaseCompare(BiomeGenName, "voronoi") == 0)
-	{
-		res = new cBioGenVoronoi(a_Seed);
-	}
-	else if (NoCaseCompare(BiomeGenName, "distortedvoronoi") == 0)
-	{
-		res = new cBioGenDistortedVoronoi(a_Seed);
-	}
-	else if (NoCaseCompare(BiomeGenName, "twolevel") == 0)
-	{
-		res = new cBioGenTwoLevel(a_Seed);
-	}
-	else
-	{
-		if (NoCaseCompare(BiomeGenName, "multistepmap") != 0)
-		{
-			LOGWARNING("Unknown BiomeGen \"%s\", using \"MultiStepMap\" instead.", BiomeGenName.c_str());
-		}
-		res = new cBioGenMultiStepMap(a_Seed);
-
-		/*
-		// Performance-testing:
-		LOGINFO("Measuring performance of cBioGenMultiStepMap...");
-		clock_t BeginTick = clock();
-		for (int x = 0; x < 5000; x++)
-		{
-			cChunkDef::BiomeMap Biomes;
-			res->GenBiomes(x * 5, x * 5, Biomes);
-		}
-		clock_t Duration = clock() - BeginTick;
-		LOGINFO("cBioGenMultiStepMap for 5000 chunks took %d ticks (%.02f sec)", Duration, (double)Duration / CLOCKS_PER_SEC);
-		//*/
-	}
-	res->InitializeBiomeGen(a_IniFile);
-	
-	return res;
-}
-
-
-
-
-
 ////////////////////////////////////////////////////////////////////////////////
 // cBioGenConstant:
 
@@ -402,8 +336,13 @@ void cBioGenVoronoi::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap &
 void cBioGenVoronoi::InitializeBiomeGen(cIniFile & a_IniFile)
 {
 	super::InitializeBiomeGen(a_IniFile);
-	m_Voronoi.SetCellSize(a_IniFile.GetValueSetI("Generator", "VoronoiCellSize", 64));
-	InitializeBiomes     (a_IniFile.GetValueSet ("Generator", "VoronoiBiomes",   ""));
+	int CellSize     = a_IniFile.GetValueSetI("Generator", "VoronoiCellSize", 128);
+	int JitterSize   = a_IniFile.GetValueSetI("Generator", "VoronoiJitterSize", CellSize);
+	int OddRowOffset = a_IniFile.GetValueSetI("Generator", "VoronoiOddRowOffset", 0);
+	m_Voronoi.SetCellSize(CellSize);
+	m_Voronoi.SetJitterSize(JitterSize);
+	m_Voronoi.SetOddRowOffset(OddRowOffset);
+	InitializeBiomes(a_IniFile.GetValueSet ("Generator", "VoronoiBiomes",   ""));
 }
 
 
@@ -846,9 +785,10 @@ void cBioGenTwoLevel::GenBiomes(int a_ChunkX, int a_ChunkZ, cChunkDef::BiomeMap
 	{
 		for (int x = 0; x < cChunkDef::Width; x++)
 		{
-			int MinDist1, MinDist2;
-			int BiomeGroup = m_VoronoiLarge.GetValueAt(DistortX[x][z], DistortZ[x][z], MinDist1, MinDist2) / 7;
-			int BiomeIdx   = m_VoronoiSmall.GetValueAt(DistortX[x][z], DistortZ[x][z], MinDist1, MinDist2) / 11;
+			int SeedX, SeedZ, MinDist2;
+			int BiomeGroup = m_VoronoiLarge.GetValueAt(DistortX[x][z], DistortZ[x][z], SeedX, SeedZ, MinDist2) / 7;
+			int BiomeIdx   = m_VoronoiSmall.GetValueAt(DistortX[x][z], DistortZ[x][z], SeedX, SeedZ, MinDist2) / 11;
+			int MinDist1 = (DistortX[x][z] - SeedX) * (DistortX[x][z] - SeedX) + (DistortZ[x][z] - SeedZ) * (DistortZ[x][z] - SeedZ);
 			cChunkDef::SetBiome(a_BiomeMap, x, z, SelectBiome(BiomeGroup, BiomeIdx, (MinDist1 < MinDist2 / 4) ? 0 : 1));
 		}
 	}
@@ -987,3 +927,69 @@ void cBioGenTwoLevel::InitializeBiomeGen(cIniFile & a_IniFile)
 
 
 
+
+////////////////////////////////////////////////////////////////////////////////
+// cBiomeGen:
+
+cBiomeGen * cBiomeGen::CreateBiomeGen(cIniFile & a_IniFile, int a_Seed, bool & a_CacheOffByDefault)
+{
+	AString BiomeGenName = a_IniFile.GetValueSet("Generator", "BiomeGen", "");
+	if (BiomeGenName.empty())
+	{
+		LOGWARN("[Generator] BiomeGen value not set in world.ini, using \"MultiStepMap\".");
+		BiomeGenName = "MultiStepMap";
+	}
+
+	cBiomeGen * res = NULL;
+	a_CacheOffByDefault = false;
+	if (NoCaseCompare(BiomeGenName, "constant") == 0)
+	{
+		res = new cBioGenConstant;
+		a_CacheOffByDefault = true;  // we're generating faster than a cache would retrieve data :)
+	}
+	else if (NoCaseCompare(BiomeGenName, "checkerboard") == 0)
+	{
+		res = new cBioGenCheckerboard;
+		a_CacheOffByDefault = true;  // we're (probably) generating faster than a cache would retrieve data
+	}
+	else if (NoCaseCompare(BiomeGenName, "voronoi") == 0)
+	{
+		res = new cBioGenVoronoi(a_Seed);
+	}
+	else if (NoCaseCompare(BiomeGenName, "distortedvoronoi") == 0)
+	{
+		res = new cBioGenDistortedVoronoi(a_Seed);
+	}
+	else if (NoCaseCompare(BiomeGenName, "twolevel") == 0)
+	{
+		res = new cBioGenTwoLevel(a_Seed);
+	}
+	else
+	{
+		if (NoCaseCompare(BiomeGenName, "multistepmap") != 0)
+		{
+			LOGWARNING("Unknown BiomeGen \"%s\", using \"MultiStepMap\" instead.", BiomeGenName.c_str());
+		}
+		res = new cBioGenMultiStepMap(a_Seed);
+
+		/*
+		// Performance-testing:
+		LOGINFO("Measuring performance of cBioGenMultiStepMap...");
+		clock_t BeginTick = clock();
+		for (int x = 0; x < 5000; x++)
+		{
+			cChunkDef::BiomeMap Biomes;
+			res->GenBiomes(x * 5, x * 5, Biomes);
+		}
+		clock_t Duration = clock() - BeginTick;
+		LOGINFO("cBioGenMultiStepMap for 5000 chunks took %d ticks (%.02f sec)", Duration, (double)Duration / CLOCKS_PER_SEC);
+		//*/
+	}
+	res->InitializeBiomeGen(a_IniFile);
+
+	return res;
+}
+
+
+
+
diff --git a/src/VoronoiMap.cpp b/src/VoronoiMap.cpp
index 68147ebfc..5ad634fe4 100644
--- a/src/VoronoiMap.cpp
+++ b/src/VoronoiMap.cpp
@@ -59,8 +59,8 @@ void cVoronoiMap::SetOddRowOffset(int a_OddRowOffset)
 
 int cVoronoiMap::GetValueAt(int a_X, int a_Y)
 {
-	int MinDist1, MinDist2;
-	return GetValueAt(a_X, a_Y, MinDist1, MinDist2);
+	int SeedX, SeedY, MinDist2;
+	return GetValueAt(a_X, a_Y, SeedX, SeedY, MinDist2);
 }
 
 
@@ -69,41 +69,47 @@ int cVoronoiMap::GetValueAt(int a_X, int a_Y)
 
 int cVoronoiMap::GetValueAt(int a_X, int a_Y, int & a_MinDist)
 {
-	int MinDist2;
-	return GetValueAt(a_X, a_Y, a_MinDist, MinDist2);
+	int SeedX, SeedY, MinDist2;
+	int res = GetValueAt(a_X, a_Y, SeedX, SeedY, MinDist2);
+	a_MinDist = (a_X - SeedX) * (a_X - SeedX) + (a_Y - SeedY) * (a_Y - SeedY);
+	return res;
 }
 
 
 
 
 
-int cVoronoiMap::GetValueAt(int a_X, int a_Y, int & a_MinDist1, int & a_MinDist2)
+int cVoronoiMap::GetValueAt(
+	int a_X, int a_Y,  // Coords to query
+	int & a_NearestSeedX, int & a_NearestSeedY,  // Coords of the closest cell
+	int & a_MinDist2  // Distance to the second closest cell
+)
 {
-	// Note that due to historical reasons, the algorithm uses XZ coords, while the input uses XY coords.
-	// This is because the algorithm was first implemented directly in the biome generators which use MC coords.
-	
 	int CellX = a_X / m_CellSize;
-	int CellZ = a_Y / m_CellSize;
+	int CellY = a_Y / m_CellSize;
 	
-	UpdateCell(CellX, CellZ);
+	UpdateCell(CellX, CellY);
 	
 	// Get 5x5 neighboring cell seeds, compare distance to each. Return the value in the minumim-distance cell
+	int NearestSeedX = 0, NearestSeedY = 0;
 	int MinDist = m_CellSize * m_CellSize * 16;  // There has to be a cell closer than this
 	int MinDist2 = MinDist;
 	int res = 0;  // Will be overriden
 	for (int x = 0; x < 5; x++)
 	{
-		for (int z = 0; z < 5; z++)
+		for (int y = 0; y < 5; y++)
 		{
-			int SeedX = m_SeedX[x][z];
-			int SeedZ = m_SeedZ[x][z];
+			int SeedX = m_SeedX[x][y];
+			int SeedY = m_SeedZ[x][y];
 			
-			int Dist = (SeedX - a_X) * (SeedX - a_X) + (SeedZ - a_Y) * (SeedZ - a_Y);
+			int Dist = (SeedX - a_X) * (SeedX - a_X) + (SeedY - a_Y) * (SeedY - a_Y);
 			if (Dist < MinDist)
 			{
+				NearestSeedX = SeedX;
+				NearestSeedY = SeedY;
 				MinDist2 = MinDist;
 				MinDist = Dist;
-				res = m_Noise3.IntNoise2DInt(x + CellX - 2, z + CellZ - 2);
+				res = m_Noise3.IntNoise2DInt(x + CellX - 2, y + CellY - 2);
 			}
 			else if (Dist < MinDist2)
 			{
@@ -112,7 +118,8 @@ int cVoronoiMap::GetValueAt(int a_X, int a_Y, int & a_MinDist1, int & a_MinDist2
 		}  // for z
 	}  // for x
 
-	a_MinDist1 = MinDist;
+	a_NearestSeedX = NearestSeedX;
+	a_NearestSeedY = NearestSeedY;
 	a_MinDist2 = MinDist2;
 	return res;
 }
@@ -121,6 +128,58 @@ int cVoronoiMap::GetValueAt(int a_X, int a_Y, int & a_MinDist1, int & a_MinDist2
 
 
 
+void cVoronoiMap::FindNearestSeeds(
+	int a_X, int a_Y,
+	int & a_NearestSeedX, int & a_NearestSeedY,
+	int & a_SecondNearestSeedX, int & a_SecondNearestSeedY
+)
+{
+	int CellX = a_X / m_CellSize;
+	int CellY = a_Y / m_CellSize;
+
+	UpdateCell(CellX, CellY);
+
+	// Get 5x5 neighboring cell seeds, compare distance to each. Return the value in the minumim-distance cell
+	int NearestSeedX = 0, NearestSeedY = 0;
+	int SecondNearestSeedX = 0, SecondNearestSeedY = 0;
+	int MinDist = m_CellSize * m_CellSize * 16;  // There has to be a cell closer than this
+	int MinDist2 = MinDist;
+	for (int x = 0; x < 5; x++)
+	{
+		for (int y = 0; y < 5; y++)
+		{
+			int SeedX = m_SeedX[x][y];
+			int SeedY = m_SeedZ[x][y];
+
+			int Dist = (SeedX - a_X) * (SeedX - a_X) + (SeedY - a_Y) * (SeedY - a_Y);
+			if (Dist < MinDist)
+			{
+				SecondNearestSeedX = NearestSeedX;
+				SecondNearestSeedY = NearestSeedY;
+				MinDist2 = MinDist;
+				NearestSeedX = SeedX;
+				NearestSeedY = SeedY;
+				MinDist = Dist;
+			}
+			else if (Dist < MinDist2)
+			{
+				SecondNearestSeedX = SeedX;
+				SecondNearestSeedY = SeedY;
+				MinDist2 = Dist;
+			}
+		}  // for z
+	}  // for x
+
+	a_NearestSeedX = NearestSeedX;
+	a_NearestSeedY = NearestSeedY;
+	a_SecondNearestSeedX = SecondNearestSeedX;
+	a_SecondNearestSeedY = SecondNearestSeedY;
+}
+
+
+
+
+
 void cVoronoiMap::UpdateCell(int a_CellX, int a_CellZ)
 {
 	// If the specified cell is currently cached, bail out:
diff --git a/src/VoronoiMap.h b/src/VoronoiMap.h
index 49f6c1da1..dfb11e9ce 100644
--- a/src/VoronoiMap.h
+++ b/src/VoronoiMap.h
@@ -40,7 +40,18 @@ public:
 	
 	/** Returns the value in the cell into which the specified point lies,
 	and the distances to the 2 nearest Voronoi seeds. Uses a cache. */
-	int GetValueAt(int a_X, int a_Y, int & a_MinDistance1, int & a_MinDistance2);
+	int GetValueAt(
+		int a_X, int a_Y,                            // Coords to query
+		int & a_NearestSeedX, int & a_NearestSeedY,  // Coords of the closest cell's seed
+		int & a_MinDist2                             // Distance to the second closest cell's seed
+	);
+
+	/** Finds the nearest and second nearest seeds, returns their coords. */
+	void FindNearestSeeds(
+		int a_X, int a_Y,
+		int & a_NearestSeedX, int & a_NearestSeedY,
+		int & a_SecondNearestSeedX, int & a_SecondNearestSeedY
+	);
 
 protected:
 	/// The noise used for generating Voronoi seeds

From 95af3eb526dc8d3289d6b1ced6462283a6ebb6b3 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Wed, 17 Sep 2014 23:32:14 +0200
Subject: [PATCH 26/28] Fixed minor style issues.

---
 src/Blocks/BlockHandler.cpp | 2 +-
 src/Entities/Player.cpp     | 4 ++--
 src/Root.cpp                | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/Blocks/BlockHandler.cpp b/src/Blocks/BlockHandler.cpp
index cee2f4b99..30b303cfd 100644
--- a/src/Blocks/BlockHandler.cpp
+++ b/src/Blocks/BlockHandler.cpp
@@ -427,7 +427,7 @@ void cBlockHandler::DropBlock(cChunkInterface & a_ChunkInterface, cWorldInterfac
 	if (a_CanDrop)
 	{
 		if ((a_Digger != NULL) && (a_Digger->GetEquippedWeapon().m_Enchantments.GetLevel(cEnchantments::enchSilkTouch) > 0))
-		{				
+		{
 			switch (m_BlockType)
 			{
 				case E_BLOCK_CAKE:
diff --git a/src/Entities/Player.cpp b/src/Entities/Player.cpp
index 3920bdb56..38d42be14 100644
--- a/src/Entities/Player.cpp
+++ b/src/Entities/Player.cpp
@@ -451,7 +451,7 @@ void cPlayer::CancelChargingBow(void)
 
 void cPlayer::SetTouchGround(bool a_bTouchGround)
 {
-	if (IsGameModeSpectator()) // You can fly through the ground in Spectator
+	if (IsGameModeSpectator())  // You can fly through the ground in Spectator
 	{
 		return;
 	}
@@ -1514,7 +1514,7 @@ void cPlayer::TossPickup(const cItem & a_Item)
 
 void cPlayer::TossItems(const cItems & a_Items)
 {
-	if (IsGameModeSpectator()) // Players can't toss items in spectator
+	if (IsGameModeSpectator())  // Players can't toss items in spectator
 	{
 		return;
 	}
diff --git a/src/Root.cpp b/src/Root.cpp
index 86a497a76..966a9b4ba 100644
--- a/src/Root.cpp
+++ b/src/Root.cpp
@@ -113,8 +113,8 @@ void cRoot::Start(void)
 	LOG("--- Started Log ---\n");
 
 	#ifdef BUILD_ID
-	LOG("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID );
-	LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME );
+	LOG("MCServer " BUILD_SERIES_NAME " build id: " BUILD_ID);
+	LOG("from commit id: " BUILD_COMMIT_ID " built at: " BUILD_DATETIME);
 	#endif
 
 	cDeadlockDetect dd;

From 98f4588ed3af39af0554687b84944f12c49e87db Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Thu, 18 Sep 2014 10:24:52 +0200
Subject: [PATCH 27/28] QtBiomeVisualiser: Fixed linux compilation.

---
 Tools/QtBiomeVisualiser/BiomeView.h           | 1 +
 Tools/QtBiomeVisualiser/ChunkCache.h          | 1 +
 Tools/QtBiomeVisualiser/ChunkLoader.h         | 2 ++
 Tools/QtBiomeVisualiser/ChunkSource.h         | 1 +
 Tools/QtBiomeVisualiser/QtBiomeVisualiser.pro | 1 +
 5 files changed, 6 insertions(+)

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.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
 
 

From 09c67bddf75a2ed244b274462305136da08b20f3 Mon Sep 17 00:00:00 2001
From: madmaxoft <github@xoft.cz>
Date: Thu, 18 Sep 2014 10:26:28 +0200
Subject: [PATCH 28/28] QtBiomeVisualiser: More gcc fixes.

---
 Tools/QtBiomeVisualiser/ChunkSource.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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++)